From 8fa75b1d6f5933c75df3e4ae221d7555d8763762 Mon Sep 17 00:00:00 2001
From: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date: Thu, 16 May 2019 17:04:30 +0200
Subject: [PATCH] PCH: Fem App

---
 src/Mod/Fem/App/AppFemPy.cpp                 |  41 +++--
 src/Mod/Fem/App/FemConstraint.cpp            |   3 +-
 src/Mod/Fem/App/FemMesh.cpp                  |  59 ++++----
 src/Mod/Fem/App/FemMeshPyImp.cpp             |  32 ++--
 src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp |  31 ++--
 src/Mod/Fem/App/FemMeshShapeObject.cpp       |  79 +++++-----
 src/Mod/Fem/App/FemPostFilter.cpp            |   5 +-
 src/Mod/Fem/App/FemPostObject.cpp            |   5 +-
 src/Mod/Fem/App/FemPostPipeline.cpp          |  27 ++--
 src/Mod/Fem/App/FemVTKTools.cpp              |  77 +++++-----
 src/Mod/Fem/App/HypothesisPy.cpp             |  78 +++++-----
 src/Mod/Fem/App/PreCompiled.h                | 150 ++++++++++++++++++-
 src/Mod/Fem/App/PropertyPostDataObject.cpp   |  33 ++--
 13 files changed, 388 insertions(+), 232 deletions(-)

diff --git a/src/Mod/Fem/App/AppFemPy.cpp b/src/Mod/Fem/App/AppFemPy.cpp
index 3fd7f4482e..750080563b 100644
--- a/src/Mod/Fem/App/AppFemPy.cpp
+++ b/src/Mod/Fem/App/AppFemPy.cpp
@@ -25,6 +25,25 @@
 #ifndef _PreComp_
 # include <Python.h>
 # include <memory>
+# include <cstdlib>
+# include <SMESH_Gen.hxx>
+# include <SMESH_Group.hxx>
+# include <SMESHDS_Mesh.hxx>
+# include <SMDS_MeshNode.hxx>
+# include <StdMeshers_MaxLength.hxx>
+# include <StdMeshers_LocalLength.hxx>
+# include <StdMeshers_NumberOfSegments.hxx>
+# include <StdMeshers_AutomaticLength.hxx>
+# include <StdMeshers_MEFISTO_2D.hxx>
+# include <StdMeshers_Deflection1D.hxx>
+# include <StdMeshers_MaxElementArea.hxx>
+# include <StdMeshers_Regular_1D.hxx>
+# include <StdMeshers_QuadranglePreference.hxx>
+# include <StdMeshers_Quadrangle_2D.hxx>
+# include <StdMeshers_LengthFromEdges.hxx>
+# include <StdMeshers_NotConformAllowed.hxx>
+# include <StdMeshers_Arithmetic1D.hxx>
+# include <Standard_Real.hxx>
 #endif
 
 #include <CXX/Extensions.hxx>
@@ -42,25 +61,6 @@
 //#include <Mod/Mesh/App/Core/Evaluation.h>
 //#include <Mod/Mesh/App/Core/Iterator.h>
 
-#include <SMESH_Gen.hxx>
-#include <SMESH_Group.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <SMDS_MeshNode.hxx>
-#include <StdMeshers_MaxLength.hxx>
-#include <StdMeshers_LocalLength.hxx>
-#include <StdMeshers_NumberOfSegments.hxx>
-#include <StdMeshers_AutomaticLength.hxx>
-#include <StdMeshers_MEFISTO_2D.hxx>
-#include <StdMeshers_Deflection1D.hxx>
-#include <StdMeshers_MaxElementArea.hxx>
-#include <StdMeshers_Regular_1D.hxx>
-#include <StdMeshers_QuadranglePreference.hxx>
-#include <StdMeshers_Quadrangle_2D.hxx>
-
-#include <StdMeshers_LengthFromEdges.hxx>
-#include <StdMeshers_NotConformAllowed.hxx>
-#include <StdMeshers_Arithmetic1D.hxx>
-
 #include "FemMesh.h"
 #include "FemMeshObject.h"
 #include "FemMeshPy.h"
@@ -69,9 +69,6 @@
 #include "FemVTKTools.h"
 #endif
 
-#include <cstdlib>
-
-#include <Standard_Real.hxx>
 #include <Base/Vector3D.h>
 #include <Mod/Part/App/OCCError.h>
 
diff --git a/src/Mod/Fem/App/FemConstraint.cpp b/src/Mod/Fem/App/FemConstraint.cpp
index 4ddd412001..a3ab684a81 100644
--- a/src/Mod/Fem/App/FemConstraint.cpp
+++ b/src/Mod/Fem/App/FemConstraint.cpp
@@ -24,6 +24,7 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <math.h> //OvG: Required for log10
 # include <TopoDS.hxx>
 # include <BRepGProp_Face.hxx>
 # include <gp_Vec.hxx>
@@ -60,7 +61,7 @@
 #include <Mod/Part/App/PartFeature.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
-#include <math.h> //OvG: Required for log10
+
 
 using namespace Fem;
 
diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp
index c7a9e36cd1..f478c0a381 100644
--- a/src/Mod/Fem/App/FemMesh.cpp
+++ b/src/Mod/Fem/App/FemMesh.cpp
@@ -33,6 +33,35 @@
 # include <TopoDS_Vertex.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
 # include <gp_Pnt.hxx>
+# include <TopoDS_Face.hxx>
+# include <TopoDS_Solid.hxx>
+# include <TopoDS_Shape.hxx>
+# include <ShapeAnalysis_ShapeTolerance.hxx>
+
+# include <boost/assign/list_of.hpp>
+# include <boost/tokenizer.hpp> //to simplify parsing input files we use the boost lib
+
+# include <SMESH_Gen.hxx>
+# include <SMESH_Mesh.hxx>
+# include <SMESH_MeshEditor.hxx>
+# include <SMESH_Group.hxx>
+# include <SMDS_MeshGroup.hxx>
+# include <SMESHDS_GroupBase.hxx>
+# include <SMESHDS_Group.hxx>
+# include <SMESHDS_Mesh.hxx>
+# include <SMDS_PolyhedralVolumeOfNodes.hxx>
+# include <SMDS_VolumeTool.hxx>
+# include <StdMeshers_MaxLength.hxx>
+# include <StdMeshers_LocalLength.hxx>
+# include <StdMeshers_MaxElementArea.hxx>
+# include <StdMeshers_NumberOfSegments.hxx>
+# include <StdMeshers_Deflection1D.hxx>
+# include <StdMeshers_Regular_1D.hxx>
+# include <StdMeshers_StartEndLength.hxx>
+# include <StdMeshers_QuadranglePreference.hxx>
+# include <StdMeshers_Quadrangle_2D.hxx>
+# include <StdMeshers_QuadraticMesh.hxx>
+
 #endif
 
 #include <Base/Writer.h>
@@ -54,37 +83,9 @@
 #include "FemVTKTools.h"
 #endif
 
-#include <boost/assign/list_of.hpp>
-#include <SMESH_Gen.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMESH_MeshEditor.hxx>
-#include <SMESH_Group.hxx>
-#include <SMDS_MeshGroup.hxx>
-#include <SMESHDS_GroupBase.hxx>
-#include <SMESHDS_Group.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <SMDS_PolyhedralVolumeOfNodes.hxx>
-#include <SMDS_VolumeTool.hxx>
-#include <StdMeshers_MaxLength.hxx>
-#include <StdMeshers_LocalLength.hxx>
-#include <StdMeshers_MaxElementArea.hxx>
-#include <StdMeshers_NumberOfSegments.hxx>
-#include <StdMeshers_Deflection1D.hxx>
-#include <StdMeshers_Regular_1D.hxx>
-#include <StdMeshers_StartEndLength.hxx>
-#include <StdMeshers_QuadranglePreference.hxx>
-#include <StdMeshers_Quadrangle_2D.hxx>
-#include <StdMeshers_QuadraticMesh.hxx>
-
-# include <TopoDS_Face.hxx>
-# include <TopoDS_Solid.hxx>
-# include <TopoDS_Shape.hxx>
-
-# include <ShapeAnalysis_ShapeTolerance.hxx>
 # include <FemMeshPy.h>
 
-//to simplify parsing input files we use the boost lib
-#include <boost/tokenizer.hpp>
+
 
 
 using namespace Fem;
diff --git a/src/Mod/Fem/App/FemMeshPyImp.cpp b/src/Mod/Fem/App/FemMeshPyImp.cpp
index 7f7e2bb85e..a8bccaca23 100644
--- a/src/Mod/Fem/App/FemMeshPyImp.cpp
+++ b/src/Mod/Fem/App/FemMeshPyImp.cpp
@@ -22,27 +22,29 @@
 
 
 #include "PreCompiled.h"
-#include <algorithm>
-#include <stdexcept>
+
+#ifndef _PreComp_
+# include <algorithm>
+# include <stdexcept>
+# include <SMESH_Gen.hxx>
+# include <SMESH_Group.hxx>
+# include <SMESH_Mesh.hxx>
+# include <SMESHDS_Group.hxx>
+# include <SMDSAbs_ElementType.hxx>
+# include <SMDS_MeshElement.hxx>
+# include <SMDS_VolumeTool.hxx>
+# include <SMESHDS_Mesh.hxx>
+
+# include <TopoDS_Shape.hxx>
+# include <TopoDS_Face.hxx>
+# include <TopoDS.hxx>
+#endif
 
 #include <Base/VectorPy.h>
 #include <Base/MatrixPy.h>
 #include <Base/PlacementPy.h>
 #include <Base/QuantityPy.h>
 
-#include <SMESH_Gen.hxx>
-#include <SMESH_Group.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMESHDS_Group.hxx>
-#include <SMDSAbs_ElementType.hxx>
-#include <SMDS_MeshElement.hxx>
-#include <SMDS_VolumeTool.hxx>
-#include <SMESHDS_Mesh.hxx>
-
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS.hxx>
-
 #include <Mod/Part/App/TopoShapePy.h>
 #include <Mod/Part/App/TopoShapeSolidPy.h>
 #include <Mod/Part/App/TopoShapeFacePy.h>
diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp b/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp
index 107e19f6fe..ca5e706166 100644
--- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp
+++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp
@@ -24,6 +24,21 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <SMESH_Gen.hxx>
+# include <SMESHDS_Mesh.hxx>
+# include <SMESH_Mesh.hxx>
+# include <SMDS_PolyhedralVolumeOfNodes.hxx>
+# include <SMDS_VolumeTool.hxx>
+
+# include <BRepBuilderAPI_Copy.hxx>
+# include <BRepTools.hxx>
+
+# ifdef FCWithNetgen
+#  include <NETGENPlugin_SimpleHypothesis_3D.hxx>
+#  include <NETGENPlugin_Hypothesis.hxx>
+#  include <NETGENPlugin_Mesher.hxx>
+# endif
+
 #endif
 
 #include "FemMeshShapeNetgenObject.h"
@@ -33,22 +48,6 @@
 #include <Mod/Part/App/PartFeature.h>
 #include <Base/Console.h>
 
-#include <SMESH_Gen.hxx>
-#include <SMESHDS_Mesh.hxx>
-
-#include <SMESH_Mesh.hxx>
-#include <SMDS_PolyhedralVolumeOfNodes.hxx>
-#include <SMDS_VolumeTool.hxx>
-
-#ifdef FCWithNetgen
-    #include <NETGENPlugin_SimpleHypothesis_3D.hxx>
-    #include <NETGENPlugin_Hypothesis.hxx>
-    #include <NETGENPlugin_Mesher.hxx>
-#endif
-
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepTools.hxx>
-
 using namespace Fem;
 using namespace App;
 
diff --git a/src/Mod/Fem/App/FemMeshShapeObject.cpp b/src/Mod/Fem/App/FemMeshShapeObject.cpp
index 5ebc2af9ac..7b41ceec14 100644
--- a/src/Mod/Fem/App/FemMeshShapeObject.cpp
+++ b/src/Mod/Fem/App/FemMeshShapeObject.cpp
@@ -24,6 +24,45 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <SMESH_Gen.hxx>
+# include <SMESH_Mesh.hxx>
+# include <SMDS_PolyhedralVolumeOfNodes.hxx>
+# include <SMDS_VolumeTool.hxx>
+# include <StdMeshers_Arithmetic1D.hxx>
+# include <StdMeshers_AutomaticLength.hxx>
+# include <StdMeshers_MaxLength.hxx>
+# include <StdMeshers_LocalLength.hxx>
+# include <StdMeshers_MaxElementArea.hxx>
+# include <StdMeshers_NotConformAllowed.hxx>
+# include <StdMeshers_QuadranglePreference.hxx>
+# include <StdMeshers_Quadrangle_2D.hxx>
+# include <StdMeshers_Regular_1D.hxx>
+# include <StdMeshers_UseExisting_1D2D.hxx>
+# include <StdMeshers_CompositeSegment_1D.hxx>
+# include <StdMeshers_Deflection1D.hxx>
+# include <StdMeshers_Hexa_3D.hxx>
+# include <StdMeshers_LayerDistribution.hxx>
+# include <StdMeshers_LengthFromEdges.hxx>
+# include <StdMeshers_MaxElementVolume.hxx>
+# include <StdMeshers_MEFISTO_2D.hxx>
+# include <StdMeshers_NumberOfLayers.hxx>
+# include <StdMeshers_NumberOfSegments.hxx>
+# include <StdMeshers_Prism_3D.hxx>
+# include <StdMeshers_Projection_1D.hxx>
+# include <StdMeshers_Projection_2D.hxx>
+# include <StdMeshers_Projection_3D.hxx>
+# include <StdMeshers_QuadraticMesh.hxx>
+# include <StdMeshers_RadialPrism_3D.hxx>
+# include <StdMeshers_SegmentAroundVertex_0D.hxx>
+# include <StdMeshers_ProjectionSource1D.hxx>
+# include <StdMeshers_ProjectionSource2D.hxx>
+# include <StdMeshers_ProjectionSource3D.hxx>
+# include <StdMeshers_SegmentLengthAroundVertex.hxx>
+# include <StdMeshers_StartEndLength.hxx>
+# include <StdMeshers_CompositeHexa_3D.hxx>
+
+# include <BRepBuilderAPI_Copy.hxx>
+# include <BRepTools.hxx>
 #endif
 
 #include "FemMeshShapeObject.h"
@@ -31,46 +70,6 @@
 #include <App/DocumentObjectPy.h>
 #include <Base/Placement.h>
 #include <Mod/Part/App/PartFeature.h>
-#include <SMESH_Gen.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMDS_PolyhedralVolumeOfNodes.hxx>
-#include <SMDS_VolumeTool.hxx>
-#include <StdMeshers_Arithmetic1D.hxx>
-#include <StdMeshers_AutomaticLength.hxx>
-#include <StdMeshers_MaxLength.hxx>
-#include <StdMeshers_LocalLength.hxx>
-#include <StdMeshers_MaxElementArea.hxx>
-#include <StdMeshers_NotConformAllowed.hxx>
-#include <StdMeshers_QuadranglePreference.hxx>
-#include <StdMeshers_Quadrangle_2D.hxx>
-#include <StdMeshers_Regular_1D.hxx>
-#include <StdMeshers_UseExisting_1D2D.hxx>
-#include <StdMeshers_CompositeSegment_1D.hxx>
-#include <StdMeshers_Deflection1D.hxx>
-#include <StdMeshers_Hexa_3D.hxx>
-#include <StdMeshers_LayerDistribution.hxx>
-#include <StdMeshers_LengthFromEdges.hxx>
-#include <StdMeshers_MaxElementVolume.hxx>
-#include <StdMeshers_MEFISTO_2D.hxx>
-#include <StdMeshers_NumberOfLayers.hxx>
-#include <StdMeshers_NumberOfSegments.hxx>
-#include <StdMeshers_Prism_3D.hxx>
-#include <StdMeshers_Projection_1D.hxx>
-#include <StdMeshers_Projection_2D.hxx>
-#include <StdMeshers_Projection_3D.hxx>
-#include <StdMeshers_QuadraticMesh.hxx>
-#include <StdMeshers_RadialPrism_3D.hxx>
-#include <StdMeshers_SegmentAroundVertex_0D.hxx>
-#include <StdMeshers_ProjectionSource1D.hxx>
-#include <StdMeshers_ProjectionSource2D.hxx>
-#include <StdMeshers_ProjectionSource3D.hxx>
-#include <StdMeshers_SegmentLengthAroundVertex.hxx>
-#include <StdMeshers_StartEndLength.hxx>
-//#include <StdMeshers_Propagation.hxx>
-#include <StdMeshers_CompositeHexa_3D.hxx>
-
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepTools.hxx>
 
 using namespace Fem;
 using namespace App;
diff --git a/src/Mod/Fem/App/FemPostFilter.cpp b/src/Mod/Fem/App/FemPostFilter.cpp
index 233982f39a..1c4f1b8f9b 100644
--- a/src/Mod/Fem/App/FemPostFilter.cpp
+++ b/src/Mod/Fem/App/FemPostFilter.cpp
@@ -24,6 +24,8 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <vtkFieldData.h>
+# include <vtkPointData.h>
 #endif
 
 #include "FemPostFilter.h"
@@ -31,8 +33,7 @@
 #include <Base/Console.h>
 #include <App/Document.h>
 #include <App/DocumentObjectPy.h>
-#include <vtkFieldData.h>
-#include <vtkPointData.h>
+
 
 using namespace Fem;
 using namespace App;
diff --git a/src/Mod/Fem/App/FemPostObject.cpp b/src/Mod/Fem/App/FemPostObject.cpp
index c8ef892124..21c7d01371 100644
--- a/src/Mod/Fem/App/FemPostObject.cpp
+++ b/src/Mod/Fem/App/FemPostObject.cpp
@@ -24,6 +24,8 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <vtkPointData.h>
+# include <vtkCellData.h>
 #endif
 
 #include "FemPostObject.h"
@@ -31,8 +33,7 @@
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectPy.h>
-#include <vtkPointData.h>
-#include <vtkCellData.h>
+
 
 using namespace Fem;
 using namespace App;
diff --git a/src/Mod/Fem/App/FemPostPipeline.cpp b/src/Mod/Fem/App/FemPostPipeline.cpp
index ca03c479d1..b3783c87e8 100644
--- a/src/Mod/Fem/App/FemPostPipeline.cpp
+++ b/src/Mod/Fem/App/FemPostPipeline.cpp
@@ -24,6 +24,19 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <SMESH_Mesh.hxx>
+# 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 <vtkXMLPolyDataReader.h>
+# include <vtkXMLStructuredGridReader.h>
+# include <vtkXMLRectilinearGridReader.h>
+# include <vtkXMLImageDataReader.h>
 #endif
 
 #include "FemPostPipeline.h"
@@ -33,22 +46,10 @@
 
 #include <Base/Console.h>
 #include <App/Document.h>
-#include <SMESH_Mesh.hxx>
+
 #include <App/DocumentObjectPy.h>
 #include <Mod/Fem/App/FemPostPipelinePy.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 <vtkXMLPolyDataReader.h>
-#include <vtkXMLStructuredGridReader.h>
-#include <vtkXMLRectilinearGridReader.h>
-#include <vtkXMLImageDataReader.h>
 
 using namespace Fem;
 using namespace App;
diff --git a/src/Mod/Fem/App/FemVTKTools.cpp b/src/Mod/Fem/App/FemVTKTools.cpp
index ff1f9a1af4..250454bf1e 100644
--- a/src/Mod/Fem/App/FemVTKTools.cpp
+++ b/src/Mod/Fem/App/FemVTKTools.cpp
@@ -37,6 +37,43 @@
 # include <TopoDS_Vertex.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
 # include <gp_Pnt.hxx>
+# include <TopoDS_Face.hxx>
+# include <TopoDS_Solid.hxx>
+# include <TopoDS_Shape.hxx>
+
+# include <SMESH_Gen.hxx>
+# include <SMESH_Mesh.hxx>
+# include <SMDS_PolyhedralVolumeOfNodes.hxx>
+# include <SMDS_VolumeTool.hxx>
+# include <SMESHDS_Mesh.hxx>
+
+# include <vtkDataSetReader.h>
+# include <vtkDataSetWriter.h>
+# include <vtkStructuredGrid.h>
+# include <vtkImageData.h>
+# include <vtkRectilinearGrid.h>
+# include <vtkUnstructuredGrid.h>
+# include <vtkXMLUnstructuredGridReader.h>
+# include <vtkXMLUnstructuredGridWriter.h>
+# include <vtkPointData.h>
+# include <vtkCellData.h>
+# include <vtkCellArray.h>
+# include <vtkDataArray.h>
+# include <vtkDoubleArray.h>
+# include <vtkIdList.h>
+# include <vtkCellTypes.h>
+# include <vtkTriangle.h>
+# include <vtkQuad.h>
+# include <vtkQuadraticTriangle.h>
+# include <vtkQuadraticQuad.h>
+# include <vtkTetra.h>
+# include <vtkPyramid.h>
+# include <vtkWedge.h>
+# include <vtkHexahedron.h>
+# include <vtkQuadraticTetra.h>
+# include <vtkQuadraticPyramid.h>
+# include <vtkQuadraticWedge.h>
+# include <vtkQuadraticHexahedron.h>
 #endif
 
 #include <Base/FileInfo.h>
@@ -49,46 +86,6 @@
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 
-#include <SMESH_Gen.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMDS_PolyhedralVolumeOfNodes.hxx>
-#include <SMDS_VolumeTool.hxx>
-#include <SMESHDS_Mesh.hxx>
-
-# include <TopoDS_Face.hxx>
-# include <TopoDS_Solid.hxx>
-# include <TopoDS_Shape.hxx>
-
-#include <vtkDataSetReader.h>
-#include <vtkDataSetWriter.h>
-#include <vtkStructuredGrid.h>
-#include <vtkImageData.h>
-#include <vtkRectilinearGrid.h>
-#include <vtkUnstructuredGrid.h>
-#include <vtkXMLUnstructuredGridReader.h>
-#include <vtkXMLUnstructuredGridWriter.h>
-
-#include <vtkPointData.h>
-#include <vtkCellData.h>
-#include <vtkCellArray.h>
-#include <vtkDataArray.h>
-#include <vtkDoubleArray.h>
-#include <vtkIdList.h>
-#include <vtkCellTypes.h>
-
-#include <vtkTriangle.h>
-#include <vtkQuad.h>
-#include <vtkQuadraticTriangle.h>
-#include <vtkQuadraticQuad.h>
-#include <vtkTetra.h>
-#include <vtkPyramid.h>
-#include <vtkWedge.h>
-#include <vtkHexahedron.h>
-#include <vtkQuadraticTetra.h>
-#include <vtkQuadraticPyramid.h>
-#include <vtkQuadraticWedge.h>
-#include <vtkQuadraticHexahedron.h>
-
 #include "FemVTKTools.h"
 #include "FemMeshProperty.h"
 #include "FemAnalysis.h"
diff --git a/src/Mod/Fem/App/HypothesisPy.cpp b/src/Mod/Fem/App/HypothesisPy.cpp
index aa7b097158..7cebb2dcc6 100755
--- a/src/Mod/Fem/App/HypothesisPy.cpp
+++ b/src/Mod/Fem/App/HypothesisPy.cpp
@@ -21,48 +21,52 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
+#ifndef _PreComp_
+# include <sstream>
+
+# include <StdMeshers_Arithmetic1D.hxx>
+# include <StdMeshers_AutomaticLength.hxx>
+# include <StdMeshers_MaxLength.hxx>
+# include <StdMeshers_LocalLength.hxx>
+# include <StdMeshers_MaxElementArea.hxx>
+# include <StdMeshers_NotConformAllowed.hxx>
+# include <StdMeshers_QuadranglePreference.hxx>
+# include <StdMeshers_Quadrangle_2D.hxx>
+# include <StdMeshers_Regular_1D.hxx>
+# include <StdMeshers_UseExisting_1D2D.hxx>
+# include <StdMeshers_CompositeSegment_1D.hxx>
+# include <StdMeshers_Deflection1D.hxx>
+# include <StdMeshers_Hexa_3D.hxx>
+# include <StdMeshers_LayerDistribution.hxx>
+# include <StdMeshers_LengthFromEdges.hxx>
+# include <StdMeshers_MaxElementVolume.hxx>
+# include <StdMeshers_MEFISTO_2D.hxx>
+# include <StdMeshers_NumberOfLayers.hxx>
+# include <StdMeshers_NumberOfSegments.hxx>
+# include <StdMeshers_Prism_3D.hxx>
+# include <StdMeshers_Projection_1D.hxx>
+# include <StdMeshers_Projection_2D.hxx>
+# include <StdMeshers_Projection_3D.hxx>
+# include <StdMeshers_QuadraticMesh.hxx>
+# include <StdMeshers_RadialPrism_3D.hxx>
+# include <StdMeshers_SegmentAroundVertex_0D.hxx>
+# include <StdMeshers_ProjectionSource1D.hxx>
+# include <StdMeshers_ProjectionSource2D.hxx>
+# include <StdMeshers_ProjectionSource3D.hxx>
+# include <StdMeshers_SegmentLengthAroundVertex.hxx>
+# include <StdMeshers_StartEndLength.hxx>
+# include <StdMeshers_CompositeHexa_3D.hxx>
+# if SMESH_VERSION_MAJOR < 7
+#  include <StdMeshers_TrianglePreference.hxx>
+# endif
+#endif
+
 #include "HypothesisPy.h"
 #include "FemMeshPy.h"
 #include <Base/Interpreter.h>
 #include <Mod/Part/App/TopoShapePy.h>
 
-#include <sstream>
-#include <StdMeshers_Arithmetic1D.hxx>
-#include <StdMeshers_AutomaticLength.hxx>
-#include <StdMeshers_MaxLength.hxx>
-#include <StdMeshers_LocalLength.hxx>
-#include <StdMeshers_MaxElementArea.hxx>
-#include <StdMeshers_NotConformAllowed.hxx>
-#include <StdMeshers_QuadranglePreference.hxx>
-#include <StdMeshers_Quadrangle_2D.hxx>
-#include <StdMeshers_Regular_1D.hxx>
-#include <StdMeshers_UseExisting_1D2D.hxx>
-#include <StdMeshers_CompositeSegment_1D.hxx>
-#include <StdMeshers_Deflection1D.hxx>
-#include <StdMeshers_Hexa_3D.hxx>
-#include <StdMeshers_LayerDistribution.hxx>
-#include <StdMeshers_LengthFromEdges.hxx>
-#include <StdMeshers_MaxElementVolume.hxx>
-#include <StdMeshers_MEFISTO_2D.hxx>
-#include <StdMeshers_NumberOfLayers.hxx>
-#include <StdMeshers_NumberOfSegments.hxx>
-#include <StdMeshers_Prism_3D.hxx>
-#include <StdMeshers_Projection_1D.hxx>
-#include <StdMeshers_Projection_2D.hxx>
-#include <StdMeshers_Projection_3D.hxx>
-#include <StdMeshers_QuadraticMesh.hxx>
-#include <StdMeshers_RadialPrism_3D.hxx>
-#include <StdMeshers_SegmentAroundVertex_0D.hxx>
-#if SMESH_VERSION_MAJOR < 7
-#include <StdMeshers_TrianglePreference.hxx>
-#endif
-#include <StdMeshers_ProjectionSource1D.hxx>
-#include <StdMeshers_ProjectionSource2D.hxx>
-#include <StdMeshers_ProjectionSource3D.hxx>
-#include <StdMeshers_SegmentLengthAroundVertex.hxx>
-#include <StdMeshers_StartEndLength.hxx>
-//#include <StdMeshers_Propagation.hxx>
-#include <StdMeshers_CompositeHexa_3D.hxx>
 
 using namespace Fem;
 
diff --git a/src/Mod/Fem/App/PreCompiled.h b/src/Mod/Fem/App/PreCompiled.h
index e433d019ee..711fb820e6 100644
--- a/src/Mod/Fem/App/PreCompiled.h
+++ b/src/Mod/Fem/App/PreCompiled.h
@@ -59,12 +59,160 @@
 #include <set>
 #include <bitset>
 #include <cstdlib>
-#include <sstream>
+#include <memory>
+#include <cmath>
 
+#include <math.h>
+
+#include <algorithm>
+#include <stdexcept>
+// Python
 #include <Python.h>
 
+// Boost
+#include <boost/assign/list_of.hpp>
+#include <boost/tokenizer.hpp>
 
+// Salomesh
+#include <SMESH_Gen.hxx>
+#include <SMESH_Group.hxx>
+#include <SMESHDS_Mesh.hxx>
+#include <SMDS_MeshNode.hxx>
+#include <StdMeshers_MaxLength.hxx>
+#include <StdMeshers_LocalLength.hxx>
+#include <StdMeshers_NumberOfSegments.hxx>
+#include <StdMeshers_AutomaticLength.hxx>
+#include <StdMeshers_MEFISTO_2D.hxx>
+#include <StdMeshers_Deflection1D.hxx>
+#include <StdMeshers_MaxElementArea.hxx>
+#include <StdMeshers_Regular_1D.hxx>
+#include <StdMeshers_QuadranglePreference.hxx>
+#include <StdMeshers_Quadrangle_2D.hxx>
+#include <StdMeshers_LengthFromEdges.hxx>
+#include <StdMeshers_NotConformAllowed.hxx>
+#include <StdMeshers_Arithmetic1D.hxx>
+#include <SMESH_Mesh.hxx>
+#include <SMESH_MeshEditor.hxx>
+#include <SMDS_MeshGroup.hxx>
+#include <SMESHDS_GroupBase.hxx>
+#include <SMESHDS_Group.hxx>
+#include <SMDS_PolyhedralVolumeOfNodes.hxx>
+#include <SMDS_VolumeTool.hxx>
+#include <StdMeshers_StartEndLength.hxx>
+#include <StdMeshers_QuadraticMesh.hxx>
+#include <SMDSAbs_ElementType.hxx>
+#include <SMDS_MeshElement.hxx>
+#include <SMESH_Gen.hxx>
+#include <StdMeshers_UseExisting_1D2D.hxx>
+#include <StdMeshers_CompositeSegment_1D.hxx>
+#include <StdMeshers_Hexa_3D.hxx>
+#include <StdMeshers_LayerDistribution.hxx>
+#include <StdMeshers_MaxElementVolume.hxx>
+#include <StdMeshers_NumberOfLayers.hxx>
+#include <StdMeshers_Prism_3D.hxx>
+#include <StdMeshers_Projection_1D.hxx>
+#include <StdMeshers_Projection_2D.hxx>
+#include <StdMeshers_Projection_3D.hxx>
+#include <StdMeshers_RadialPrism_3D.hxx>
+#include <StdMeshers_SegmentAroundVertex_0D.hxx>
+#include <StdMeshers_ProjectionSource1D.hxx>
+#include <StdMeshers_ProjectionSource2D.hxx>
+#include <StdMeshers_ProjectionSource3D.hxx>
+#include <StdMeshers_SegmentLengthAroundVertex.hxx>
+#include <StdMeshers_CompositeHexa_3D.hxx>
 
+#if SMESH_VERSION_MAJOR < 7
+# include <StdMeshers_TrianglePreference.hxx>
+#endif
+
+// Opencascade
+#include <Standard_Real.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Solid.hxx>
+#include <TopoDS_Shape.hxx>
+#include <ShapeAnalysis_ShapeTolerance.hxx>
+#include <TopoDS.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
+#include <BRepTools.hxx>
+#include <BRepAdaptor_Curve.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <gp_Dir.hxx>
+#include <gp_Lin.hxx>
+#include <gp_Pln.hxx>
+#include <gp_Vec.hxx>
+#include <ElCLib.hxx>
+#include <ElSLib.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineCurve.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Precision.hxx>
+#include <TColgp_Array2OfPnt.hxx>
+#include <TopoDS_Edge.hxx>
+#include <Bnd_Box.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepBndLib.hxx>
+#include <BRepExtrema_DistShapeShape.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#include <gp_Pnt.hxx>
+
+// VTK
+#include <vtkFieldData.h>
+#include <vtkPointData.h>
+#include <vtkCellData.h>
+#include <vtkDataSetReader.h>
+#include <vtkGeometryFilter.h>
+#include <vtkStructuredGrid.h>
+#include <vtkUnstructuredGrid.h>
+#include <vtkImageData.h>
+#include <vtkRectilinearGrid.h>
+#include <vtkAppendFilter.h>
+#include <vtkDataSetReader.h>
+#include <vtkDataSetWriter.h>
+#include <vtkStructuredGrid.h>
+#include <vtkImageData.h>
+#include <vtkRectilinearGrid.h>
+#include <vtkXMLUnstructuredGridWriter.h>
+#include <vtkPointData.h>
+#include <vtkCellData.h>
+#include <vtkCellArray.h>
+#include <vtkDataArray.h>
+#include <vtkDoubleArray.h>
+#include <vtkIdList.h>
+#include <vtkCellTypes.h>
+#include <vtkTriangle.h>
+#include <vtkQuad.h>
+#include <vtkQuadraticTriangle.h>
+#include <vtkQuadraticQuad.h>
+#include <vtkTetra.h>
+#include <vtkPyramid.h>
+#include <vtkWedge.h>
+#include <vtkHexahedron.h>
+#include <vtkQuadraticTetra.h>
+#include <vtkQuadraticPyramid.h>
+#include <vtkQuadraticWedge.h>
+#include <vtkQuadraticHexahedron.h>
+#include <vtkPolyData.h>
+#include <vtkStructuredGrid.h>
+#include <vtkRectilinearGrid.h>
+#include <vtkUniformGrid.h>
+#include <vtkCompositeDataSet.h>
+#include <vtkMultiBlockDataSet.h>
+#include <vtkMultiPieceDataSet.h>
+#include <vtkXMLDataSetWriter.h>
+#include <vtkXMLPolyDataReader.h>
+#include <vtkXMLStructuredGridReader.h>
+#include <vtkXMLUnstructuredGridReader.h>
+#include <vtkXMLRectilinearGridReader.h>
+#include <vtkXMLImageDataReader.h>
+
+// Netgen
+#ifdef FCWithNetgen
+# include <NETGENPlugin_SimpleHypothesis_3D.hxx>
+# include <NETGENPlugin_Hypothesis.hxx>
+# include <NETGENPlugin_Mesher.hxx>
+#endif
 
 #endif // _PreComp_
 #endif
diff --git a/src/Mod/Fem/App/PropertyPostDataObject.cpp b/src/Mod/Fem/App/PropertyPostDataObject.cpp
index 5d5952720c..a67963631b 100644
--- a/src/Mod/Fem/App/PropertyPostDataObject.cpp
+++ b/src/Mod/Fem/App/PropertyPostDataObject.cpp
@@ -22,26 +22,31 @@
 
 
 #include "PreCompiled.h"
+
+#ifndef _PreComp_
+# 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 <vtkXMLDataSetWriter.h>
+# include <vtkXMLPolyDataReader.h>
+# include <vtkXMLStructuredGridReader.h>
+# include <vtkXMLUnstructuredGridReader.h>
+# include <vtkXMLRectilinearGridReader.h>
+# include <vtkXMLImageDataReader.h>
+#endif
+
 #include <Base/FileInfo.h>
 #include <Base/Console.h>
 #include <Base/Writer.h>
 #include <Base/Reader.h>
 #include <App/Application.h>
 #include <App/DocumentObject.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 <vtkXMLDataSetWriter.h>
-#include <vtkXMLPolyDataReader.h>
-#include <vtkXMLStructuredGridReader.h>
-#include <vtkXMLUnstructuredGridReader.h>
-#include <vtkXMLRectilinearGridReader.h>
-#include <vtkXMLImageDataReader.h>
+
 #include "PropertyPostDataObject.h"
 
 #ifndef _PreComp_