diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp
index a9a42b1d01..57df6684d7 100644
--- a/src/Mod/Fem/Gui/Command.cpp
+++ b/src/Mod/Fem/Gui/Command.cpp
@@ -27,11 +27,15 @@
 # include <QApplication>
 # include <QMessageBox>
 # include <QAction>
-#endif
 
-#include <Inventor/nodes/SoEventCallback.h>
-#include <Inventor/nodes/SoCamera.h>
-#include <Inventor/events/SoMouseButtonEvent.h>
+# include <Inventor/nodes/SoEventCallback.h>
+# include <Inventor/nodes/SoCamera.h>
+# include <Inventor/events/SoMouseButtonEvent.h>
+
+# include <SMESH_Mesh.hxx>
+# include <SMESHDS_Mesh.hxx>
+# include <SMDSAbs_ElementType.hxx>
+#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
@@ -51,10 +55,6 @@
 #include <Gui/Action.h>
 #include <Gui/BitmapFactory.h>
 
-#include <SMESH_Mesh.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <SMDSAbs_ElementType.hxx>
-
 #include <Mod/Part/App/PartFeature.h>
 #include <Mod/Fem/App/FemMeshObject.h>
 #include <Mod/Fem/App/FemSetNodesObject.h>
diff --git a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h
index 94309cd4ce..0093373abc 100644
--- a/src/Mod/Fem/Gui/PreCompiled.h
+++ b/src/Mod/Fem/Gui/PreCompiled.h
@@ -52,6 +52,8 @@
 #include <assert.h>
 #include <cmath>
 
+#include <math.h>
+
 // STL
 #include <vector>
 #include <map>
@@ -62,20 +64,128 @@
 #include <stack>
 #include <queue>
 #include <bitset>
+#include <sstream>
 
 // boost
 #include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
 #endif
 
+// OCC
+#include <Standard_math.hxx>
+#include <Precision.hxx>
+#include <TopoDS.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <Geom_Plane.hxx>
+#include <gp_Pln.hxx>
+#include <gp_Ax1.hxx>
+#include <BRepAdaptor_Curve.hxx>
+#include <Geom_Line.hxx>
+#include <gp_Lin.hxx>
+#include <Standard_PrimitiveTypes.hxx>
+#include <TopoDS_Shape.hxx>
 
 // Qt Toolkit
 #ifndef __Qt4All__
 # include <Gui/Qt4All.h>
 #endif
 
+#include <qobject.h>
+#include <QRegExp>
+#include <QTextCharFormat>
+#include <QFileInfo>
+#include <QApplication>
+#include <QMessageBox>
+#include <QAction>
+#include <QString>
+#include <QSlider>
+#include <QKeyEvent>
+#include <QTextStream>
+#include <QString>
+#include <QSlider>
+#include <QPushButton>
+#include <QMenu>
+#include <QDockWidget>
+#include <QStackedWidget>
+#include <QFile>
+
+// inventor
+#include <Inventor/nodes/SoEventCallback.h>
+#include <Inventor/nodes/SoCamera.h>
+#include <Inventor/events/SoMouseButtonEvent.h>
+#include <Inventor/SoPickedPoint.h>
+#include <Inventor/nodes/SoAnnotation.h>
+#include <Inventor/nodes/SoBaseColor.h>
+#include <Inventor/nodes/SoFontStyle.h>
+#include <Inventor/nodes/SoPickStyle.h>
+#include <Inventor/nodes/SoText2.h>
+#include <Inventor/nodes/SoTranslation.h>
+#include <Inventor/nodes/SoCoordinate3.h>
+#include <Inventor/nodes/SoIndexedLineSet.h>
+#include <Inventor/nodes/SoMarkerSet.h>
+#include <Inventor/nodes/SoDrawStyle.h>
+#include <Inventor/nodes/SoSeparator.h>
+#include <Inventor/nodes/SoRotation.h>
+#include <Inventor/nodes/SoMaterial.h>
+#include <Inventor/nodes/SoCylinder.h>
+#include <Inventor/nodes/SoCone.h>
+#include <Inventor/nodes/SoCube.h>
+#include <Inventor/nodes/SoShapeHints.h>
+#include <Inventor/nodes/SoComplexity.h>
+#include <Inventor/nodes/SoMultipleCopy.h>
+#include <Inventor/nodes/SoText3.h>
+#include <Inventor/nodes/SoFont.h>
+#include <Inventor/nodes/SoMaterialBinding.h>
+#include <Inventor/nodes/SoScale.h>
+#include <Inventor/nodes/SoSphere.h>
+#include <Inventor/SoDB.h>
+#include <Inventor/SoInput.h>
+#include <Inventor/SbVec3f.h>
+#include <Inventor/actions/SoSearchAction.h>
+#include <Inventor/nodes/SoLightModel.h>
+#include <Inventor/nodes/SoTransform.h>
+#include <Inventor/nodes/SoIndexedFaceSet.h>
+#include <Inventor/nodes/SoPointSet.h>
+#include <Inventor/nodes/SoPolygonOffset.h>
+#include <Inventor/details/SoFaceDetail.h>
+#include <Inventor/details/SoLineDetail.h>
+#include <Inventor/details/SoPointDetail.h>
+
+#include <Inventor/nodes/SoSurroundScale.h>
+#include <Inventor/nodes/SoLineSet.h>
+#include <Inventor/nodes/SoMatrixTransform.h>
+#include <Inventor/manips/SoTransformManip.h>
+#include <Inventor/manips/SoCenterballManip.h>
+#include <Inventor/manips/SoTransformerManip.h>
+#include <Inventor/manips/SoTransformBoxManip.h>
+#include <Inventor/manips/SoHandleBoxManip.h>
+#include <Inventor/manips/SoTabBoxManip.h>
+#include <Inventor/engines/SoDecomposeMatrix.h>
+#include <Inventor/draggers/SoCenterballDragger.h>
+#include <Inventor/draggers/SoTransformerDragger.h>
+#include <Inventor/draggers/SoTransformBoxDragger.h>
+#include <Inventor/draggers/SoHandleBoxDragger.h>
+
+#include <Inventor/nodes/SoIndexedPointSet.h>
+#include <Inventor/nodes/SoIndexedTriangleStripSet.h>
+#include <Inventor/nodes/SoShapeHints.h>
+#include <Inventor/nodes/SoNormal.h>
+
+
+// Salomesh
+#include <SMESH_Mesh.hxx>
+#include <SMESHDS_Mesh.hxx>
+#include <SMDSAbs_ElementType.hxx>
+
+// VTK
+#include <vtkPointData.h>
+#include <vtkCellArray.h>
+#include <vtkCellData.h>
+#include <vtkLookupTable.h>
+
 #endif //_PreComp_
 
 #endif // FEMGUI_PRECOMPILED_H
diff --git a/src/Mod/Fem/Gui/PropertyFemMeshItem.cpp b/src/Mod/Fem/Gui/PropertyFemMeshItem.cpp
index 6f6e9fdf80..c1de6d3c6b 100644
--- a/src/Mod/Fem/Gui/PropertyFemMeshItem.cpp
+++ b/src/Mod/Fem/Gui/PropertyFemMeshItem.cpp
@@ -24,11 +24,12 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <SMESH_Mesh.hxx>
 #endif
 
 #include "PropertyFemMeshItem.h"
 #include <Mod/Fem/App/FemMeshProperty.h>
-#include <SMESH_Mesh.hxx>
+
 
 using namespace FemGui;
 
diff --git a/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp b/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp
index 5a765e0cb7..11edc3a4f1 100644
--- a/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp
+++ b/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp
@@ -25,9 +25,10 @@
 #ifndef _PreComp_
 # include <QString>
 # include <QSlider>
+
+# include <Standard_math.hxx>
 #endif
 
-#include <Standard_math.hxx>
 #include "ui_TaskAnalysisInfo.h"
 #include "TaskAnalysisInfo.h"
 #include <Gui/Application.h>
diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
index 9d14e38e3f..231f484010 100644
--- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
+++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
@@ -25,9 +25,18 @@
 #ifndef _PreComp_
 # include <QString>
 # include <QSlider>
+
+# include <Standard_math.hxx>
+
+# include <Inventor/nodes/SoEventCallback.h>
+# include <Inventor/nodes/SoCamera.h>
+# include <Inventor/events/SoMouseButtonEvent.h>
+
+# include <SMESH_Mesh.hxx>
+# include <SMESHDS_Mesh.hxx>
+# include <SMDSAbs_ElementType.hxx>
 #endif
 
-#include <Standard_math.hxx>
 #include "ui_TaskCreateNodeSet.h"
 #include "TaskCreateNodeSet.h"
 #include <Gui/Application.h>
@@ -40,14 +49,6 @@
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/Utilities.h>
 
-#include <Inventor/nodes/SoEventCallback.h>
-#include <Inventor/nodes/SoCamera.h>
-#include <Inventor/events/SoMouseButtonEvent.h>
-
-#include <SMESH_Mesh.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <SMDSAbs_ElementType.hxx>
-
 #include <Mod/Fem/App/FemMeshObject.h>
 #include <Mod/Fem/App/FemSetNodesObject.h>
 #include "ViewProviderFemMesh.h"
diff --git a/src/Mod/Fem/Gui/TaskDriver.cpp b/src/Mod/Fem/Gui/TaskDriver.cpp
index 82a5436fbf..4a59ee230f 100644
--- a/src/Mod/Fem/Gui/TaskDriver.cpp
+++ b/src/Mod/Fem/Gui/TaskDriver.cpp
@@ -23,11 +23,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <Standard_math.hxx>
+
 # include <QString>
 # include <QSlider>
 #endif
 
-#include <Standard_math.hxx>
+
 #include "ui_TaskDriver.h"
 #include "TaskDriver.h"
 #include <Gui/Application.h>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.cpp b/src/Mod/Fem/Gui/TaskFemConstraint.cpp
index d0edf8e044..e354cdd506 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraint.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraint.cpp
@@ -25,10 +25,12 @@
 
 #ifndef _PreComp_
 # include <sstream>
+
 # include <QKeyEvent>
 # include <QRegExp>
 # include <QTextStream>
 # include <QMessageBox>
+
 # include <Precision.hxx>
 # include <TopoDS.hxx>
 # include <BRepAdaptor_Surface.hxx>
@@ -38,6 +40,8 @@
 # include <BRepAdaptor_Curve.hxx>
 # include <Geom_Line.hxx>
 # include <gp_Lin.hxx>
+
+# include <boost/lexical_cast.hpp> //OvG conversion between string and int etc.
 #endif
 
 #include "ui_TaskFemConstraint.h"
@@ -56,7 +60,6 @@
 
 #include <Base/Console.h>
 
-# include <boost/lexical_cast.hpp> //OvG conversion between string and int etc.
 
 using namespace FemGui;
 using namespace Gui;
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp b/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp
index cd9b64a946..c50eaf6589 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp
@@ -25,10 +25,12 @@
 
 #ifndef _PreComp_
 # include <sstream>
+
 # include <QRegExp>
 # include <QTextStream>
 # include <QMessageBox>
 # include <QAction>
+
 # include <Precision.hxx>
 # include <TopoDS.hxx>
 # include <BRepAdaptor_Surface.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
index 5ef617381c..b8aa094d83 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
@@ -26,10 +26,12 @@
 
 #ifndef _PreComp_
 # include <sstream>
+
 # include <QRegExp>
 # include <QTextStream>
 # include <QMessageBox>
 # include <QAction>
+
 # include <Precision.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Shape.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
index 94fa4209aa..92d9bcc116 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
@@ -25,10 +25,12 @@
 
 #ifndef _PreComp_
 # include <sstream>
+
 # include <QRegExp>
 # include <QTextStream>
 # include <QMessageBox>
 # include <QAction>
+
 # include <Precision.hxx>
 # include <TopoDS.hxx>
 # include <BRepAdaptor_Surface.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintGear.cpp b/src/Mod/Fem/Gui/TaskFemConstraintGear.cpp
index 93c05d1cf6..5ee1c4087e 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintGear.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintGear.cpp
@@ -24,12 +24,6 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-/*
-# include <sstream>
-# include <QRegExp>
-# include <QTextStream>
-# include <QMessageBox>
-# include <Precision.hxx>*/
 # include <TopoDS.hxx>
 # include <BRepAdaptor_Surface.hxx>
 # include <Geom_Plane.hxx>
@@ -38,6 +32,7 @@
 # include <BRepAdaptor_Curve.hxx>
 # include <Geom_Line.hxx>
 # include <gp_Lin.hxx>
+
 # include <QMessageBox>
 #endif
 
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
index 20a636215d..f3fbf37ee6 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
@@ -31,14 +31,16 @@
 # include <Geom_Line.hxx>
 # include <Geom_Plane.hxx>
 # include <Precision.hxx>
-# include <QMessageBox>
-# include <QAction>
-# include <QRegExp>
-# include <QTextStream>
 # include <TopoDS.hxx>
 # include <gp_Ax1.hxx>
 # include <gp_Lin.hxx>
 # include <gp_Pln.hxx>
+
+# include <QMessageBox>
+# include <QAction>
+# include <QRegExp>
+# include <QTextStream>
+
 # include <sstream>
 #endif
 
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.cpp b/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.cpp
index 93a1e05439..d9c9002440 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.cpp
@@ -31,13 +31,15 @@
 # include <Geom_Line.hxx>
 # include <Geom_Plane.hxx>
 # include <Precision.hxx>
-# include <QMessageBox>
-# include <QRegExp>
-# include <QTextStream>
 # include <TopoDS.hxx>
 # include <gp_Ax1.hxx>
 # include <gp_Lin.hxx>
 # include <gp_Pln.hxx>
+
+# include <QMessageBox>
+# include <QRegExp>
+# include <QTextStream>
+
 # include <sstream>
 #endif
 
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
index 29d90c3341..de30cd75fc 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
@@ -27,10 +27,12 @@
 
 #ifndef _PreComp_
 # include <sstream>
+
 # include <QRegExp>
 # include <QTextStream>
 # include <QMessageBox>
 # include <QAction>
+
 # include <Precision.hxx>
 # include <TopoDS.hxx>
 # include <BRepAdaptor_Surface.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
index a85289183f..864d8f56f6 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
@@ -29,14 +29,16 @@
 # include <Geom_Line.hxx>
 # include <Geom_Plane.hxx>
 # include <Precision.hxx>
-# include <QMessageBox>
-# include <QAction>
-# include <QRegExp>
-# include <QTextStream>
 # include <TopoDS.hxx>
 # include <gp_Ax1.hxx>
 # include <gp_Lin.hxx>
 # include <gp_Pln.hxx>
+
+# include <QMessageBox>
+# include <QAction>
+# include <QRegExp>
+# include <QTextStream>
+
 # include <sstream>
 #endif
 
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
index 88e9029fd5..2cca083da8 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
@@ -31,15 +31,17 @@
 # include <Geom_Line.hxx>
 # include <Geom_Plane.hxx>
 # include <Precision.hxx>
-# include <QMessageBox>
-# include <QAction>
-# include <QRegExp>
-# include <QTextStream>
 # include <TopoDS.hxx>
 # include <gp_Ax1.hxx>
 # include <gp_Lin.hxx>
 # include <gp_Pln.hxx>
+
 # include <sstream>
+
+# include <QMessageBox>
+# include <QAction>
+# include <QRegExp>
+# include <QTextStream>
 #endif
 
 #include "Mod/Fem/App/FemConstraintTemperature.h"
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
index e3afeb785c..fc5d41f9df 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
@@ -32,14 +32,16 @@
 # include <Geom_Line.hxx>
 # include <Geom_Plane.hxx>
 # include <Precision.hxx>
-# include <QMessageBox>
-# include <QAction>
-# include <QRegExp>
-# include <QTextStream>
 # include <TopoDS.hxx>
 # include <gp_Ax1.hxx>
 # include <gp_Lin.hxx>
 # include <gp_Pln.hxx>
+
+# include <QMessageBox>
+# include <QAction>
+# include <QRegExp>
+# include <QTextStream>
+
 # include <sstream>
 #endif
 
diff --git a/src/Mod/Fem/Gui/TaskObjectName.cpp b/src/Mod/Fem/Gui/TaskObjectName.cpp
index cb8919db65..813f372a46 100644
--- a/src/Mod/Fem/Gui/TaskObjectName.cpp
+++ b/src/Mod/Fem/Gui/TaskObjectName.cpp
@@ -24,10 +24,11 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <QString>
+# include <QSlider>
 #endif
 
-#include <QString>
-#include <QSlider>
+
 #include "ui_TaskObjectName.h"
 #include "TaskObjectName.h"
 #include <Gui/Application.h>
diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
index 1f0301f485..5139b81505 100644
--- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp
+++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
@@ -24,6 +24,22 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <Inventor/events/SoMouseButtonEvent.h>
+# include <Inventor/SoPickedPoint.h>
+# include <Inventor/nodes/SoAnnotation.h>
+# include <Inventor/nodes/SoBaseColor.h>
+# include <Inventor/nodes/SoFontStyle.h>
+# include <Inventor/nodes/SoPickStyle.h>
+# include <Inventor/nodes/SoText2.h>
+# include <Inventor/nodes/SoTranslation.h>
+# include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoIndexedLineSet.h>
+# include <Inventor/nodes/SoMarkerSet.h>
+# include <Inventor/nodes/SoDrawStyle.h>
+
+# include <sstream>
+
+# include <QApplication>
 #endif
 
 #include "ui_TaskPostDisplay.h"
@@ -37,6 +53,7 @@
 #include "ViewProviderFemPostObject.h"
 #include "ViewProviderFemPostFunction.h"
 #include "ViewProviderFemPostFilter.h"
+
 #include <Mod/Fem/App/FemPostObject.h>
 #include <Mod/Fem/App/FemPostFilter.h>
 #include <Mod/Fem/App/FemPostPipeline.h>
@@ -46,25 +63,9 @@
 #include <Gui/Command.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Action.h>
-#include <QMessageBox>
-#include <QPushButton>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-# include <Inventor/events/SoMouseButtonEvent.h>
 
-# include <sstream>
-# include <QApplication>
-# include <Inventor/SoPickedPoint.h>
-# include <Inventor/nodes/SoAnnotation.h>
-# include <Inventor/nodes/SoBaseColor.h>
-# include <Inventor/nodes/SoFontStyle.h>
-# include <Inventor/nodes/SoPickStyle.h>
-# include <Inventor/nodes/SoText2.h>
-# include <Inventor/nodes/SoTranslation.h>
-# include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoIndexedLineSet.h>
-# include <Inventor/nodes/SoMarkerSet.h>
-# include <Inventor/nodes/SoDrawStyle.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/Inventor/MarkerBitmaps.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Fem/Gui/TaskTetParameter.cpp b/src/Mod/Fem/Gui/TaskTetParameter.cpp
index 2ac5298a8c..b1dc77cee6 100644
--- a/src/Mod/Fem/Gui/TaskTetParameter.cpp
+++ b/src/Mod/Fem/Gui/TaskTetParameter.cpp
@@ -25,9 +25,10 @@
 #ifndef _PreComp_
 # include <QString>
 # include <QSlider>
+
+# include <Standard_math.hxx>
 #endif
 
-#include <Standard_math.hxx>
 #include "ui_TaskTetParameter.h"
 #include "TaskTetParameter.h"
 #include <Gui/Application.h>
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp
index 069c950e8c..36056d66aa 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp
@@ -25,11 +25,13 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+
 # include <QAction>
 # include <QApplication>
 # include <QDockWidget>
 # include <QMenu>
 # include <QStackedWidget>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoFontStyle.h>
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp
index 2a330609e7..b1aa7b7683 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp
@@ -25,10 +25,12 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
-# include <Precision.hxx>
+
 # include <QMessageBox>
 #endif
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp
index e6ebbcd206..eae13949e0 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp
@@ -28,6 +28,8 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
@@ -38,7 +40,6 @@
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoScale.h>
-# include <Precision.hxx>
 #endif
 
 #include "Mod/Fem/App/FemConstraintContact.h"
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp
index fbd32dc32e..4929cebe1c 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp
@@ -28,11 +28,12 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
 # include <Inventor/nodes/SoMultipleCopy.h>
-# include <Precision.hxx>
 #endif
 
 #include "Mod/Fem/App/FemConstraintDisplacement.h"
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp
index 98c9b12546..236526c6c8 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp
@@ -25,11 +25,13 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
 # include <Inventor/nodes/SoMultipleCopy.h>
-# include <Precision.hxx>
+
 # include <QMessageBox>
 #endif
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp
index f993baa97a..dbfbe1a14e 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp
@@ -25,11 +25,13 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
 # include <Inventor/nodes/SoMultipleCopy.h>
-# include <Precision.hxx>
+
 # include <QMessageBox>
 #endif
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp
index bff7834356..bb2203a253 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp
@@ -25,11 +25,13 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
 # include <Inventor/nodes/SoMultipleCopy.h>
-# include <Precision.hxx>
+
 # include <QMessageBox>
 #endif
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp
index 6317a72c79..d2cf2cb48a 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp
@@ -25,11 +25,13 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
 # include <Inventor/SbMatrix.h>
-# include <Precision.hxx>
+
 # include <QMessageBox>
 #endif
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp
index 7d179173f6..37cec85e6d 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp
@@ -28,6 +28,8 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
@@ -38,7 +40,6 @@
 # include <Inventor/nodes/SoFont.h>
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoMaterialBinding.h>
-# include <Precision.hxx>
 #endif
 
 #include "Mod/Fem/App/FemConstraintHeatflux.h"
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.cpp
index 376afe5e06..f129552868 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.cpp
@@ -28,6 +28,8 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
@@ -38,7 +40,6 @@
 # include <Inventor/nodes/SoFont.h>
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoMaterialBinding.h>
-# include <Precision.hxx>
 #endif
 
 #include "Mod/Fem/App/FemConstraintInitialTemperature.h"
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.cpp
index c497aa45b6..8600488201 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.cpp
@@ -28,6 +28,8 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
@@ -39,7 +41,6 @@
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoScale.h>
-# include <Precision.hxx>
 #endif
 
 #include "Mod/Fem/App/FemConstraintPlaneRotation.h"
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp
index 3e71cbf977..95a04c1235 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp
@@ -26,11 +26,12 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
 # include <Inventor/nodes/SoMultipleCopy.h>
-# include <Precision.hxx>
 #endif
 
 #include "Mod/Fem/App/FemConstraintPressure.h"
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp
index 71a7f8693f..c634543bf3 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp
@@ -25,10 +25,12 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
-# include <Precision.hxx>
+
 # include <QMessageBox>
 #endif
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp
index dec13e1a77..707d6227eb 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp
@@ -28,6 +28,8 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
@@ -39,7 +41,6 @@
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoScale.h>
-# include <Precision.hxx>
 #endif
 
 #include "Mod/Fem/App/FemConstraintTemperature.h"
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.cpp
index b30c42b2d4..a70dcb8dc8 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.cpp
@@ -29,6 +29,8 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Precision.hxx>
+
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTranslation.h>
 # include <Inventor/nodes/SoRotation.h>
@@ -41,8 +43,10 @@
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoScale.h>
-# include <Precision.hxx>
+
+# include <math.h>
 #endif
+
 #include <Gui/Command.h>
 
 #include "Mod/Fem/App/FemConstraintTransform.h"
@@ -51,7 +55,7 @@
 #include <Base/Console.h>
 #include <Gui/Control.h>
 
-#include <math.h>
+
 #define PI (3.141592653589793238462643383279502884L)
 
 using namespace FemGui;
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
index b0dfc42245..1d093e0fce 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
@@ -25,6 +25,7 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+
 # include <Inventor/SoDB.h>
 # include <Inventor/SoInput.h>
 # include <Inventor/SbVec3f.h>
@@ -47,7 +48,14 @@
 # include <Inventor/details/SoFaceDetail.h>
 # include <Inventor/details/SoLineDetail.h>
 # include <Inventor/details/SoPointDetail.h>
+
 # include <QFile>
+
+# include <sstream>
+
+# include <SMESH_Mesh.hxx>
+# include <SMESHDS_Mesh.hxx>
+# include <SMDSAbs_ElementType.hxx>
 #endif
 
 #include "ViewProviderFemMesh.h"
@@ -61,11 +69,8 @@
 #include <Base/Console.h>
 #include <Base/TimeInfo.h>
 #include <Base/BoundBox.h>
-#include <sstream>
 
-#include <SMESH_Mesh.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <SMDSAbs_ElementType.hxx>
+
 
 using namespace FemGui;
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp
index cad9fac752..8a9e97cf38 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp
@@ -1,6 +1,12 @@
 
 #include "PreCompiled.h"
 
+#ifndef _PreComp_
+# include <SMESH_Mesh.hxx>
+# include <SMESHDS_Mesh.hxx>
+# include <SMDSAbs_ElementType.hxx>
+#endif
+
 #include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
 
@@ -10,9 +16,7 @@
 #include <Mod/Fem/App/FemResultObject.h>
 #include <Mod/Fem/App/FemMeshObject.h>
 #include <Mod/Fem/App/FemMesh.h>
-#include <SMESH_Mesh.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <SMDSAbs_ElementType.hxx>
+
 
 // inclusion of the generated files (generated out of ViewProviderFemMeshPy.xml)
 #include "ViewProviderFemMeshPy.h"
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
index 91b615aa4a..86623fd0bd 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
@@ -24,27 +24,32 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <Inventor/nodes/SoCoordinate3.h>
-#include <Inventor/nodes/SoMaterial.h>
-#include <Inventor/nodes/SoSurroundScale.h>
-#include <Inventor/nodes/SoLineSet.h>
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoTransform.h>
-#include <Inventor/nodes/SoMatrixTransform.h>
-#include <Inventor/nodes/SoSphere.h>
-#include <Inventor/manips/SoTransformManip.h>
-#include <Inventor/manips/SoCenterballManip.h>
-#include <Inventor/manips/SoTransformerManip.h>
-#include <Inventor/manips/SoTransformBoxManip.h>
-#include <Inventor/manips/SoHandleBoxManip.h>
-#include <Inventor/manips/SoTabBoxManip.h>
-#include <Inventor/actions/SoSearchAction.h>
-#include <Inventor/engines/SoDecomposeMatrix.h>
-#include <Inventor/draggers/SoCenterballDragger.h>
-#include <Inventor/draggers/SoTransformerDragger.h>
-#include <Inventor/draggers/SoTransformBoxDragger.h>
-#include <Inventor/draggers/SoHandleBoxDragger.h>
-#include <QMessageBox>
+# include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoSurroundScale.h>
+# include <Inventor/nodes/SoLineSet.h>
+# include <Inventor/nodes/SoSeparator.h>
+# include <Inventor/nodes/SoTransform.h>
+# include <Inventor/nodes/SoMatrixTransform.h>
+# include <Inventor/nodes/SoSphere.h>
+# include <Inventor/manips/SoTransformManip.h>
+# include <Inventor/manips/SoCenterballManip.h>
+# include <Inventor/manips/SoTransformerManip.h>
+# include <Inventor/manips/SoTransformBoxManip.h>
+# include <Inventor/manips/SoHandleBoxManip.h>
+# include <Inventor/manips/SoTabBoxManip.h>
+# include <Inventor/actions/SoSearchAction.h>
+# include <Inventor/engines/SoDecomposeMatrix.h>
+# include <Inventor/draggers/SoCenterballDragger.h>
+# include <Inventor/draggers/SoTransformerDragger.h>
+# include <Inventor/draggers/SoTransformBoxDragger.h>
+# include <Inventor/draggers/SoHandleBoxDragger.h>
+
+# include <QMessageBox>
+
+# include <boost/bind.hpp>
+
+# include <math.h>
 #endif
 
 #include "ViewProviderFemPostFunction.h"
@@ -60,9 +65,6 @@
 #include <Gui/Control.h>
 #include <App/PropertyUnits.h>
 
-#include <boost/bind.hpp>
-#include <math.h>
-
 #include "ui_PlaneWidget.h"
 #include "ui_SphereWidget.h"
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
index dde2bd8241..65ef8ff9fa 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
@@ -24,18 +24,25 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <Inventor/nodes/SoCoordinate3.h>
-#include <Inventor/nodes/SoIndexedPointSet.h>
-#include <Inventor/nodes/SoIndexedLineSet.h>
-#include <Inventor/nodes/SoIndexedFaceSet.h>
-#include <Inventor/nodes/SoIndexedTriangleStripSet.h>
-#include <Inventor/nodes/SoShapeHints.h>
-#include <Inventor/nodes/SoMaterial.h>
-#include <Inventor/nodes/SoNormal.h>
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoPointSet.h>
-#include <Inventor/nodes/SoPolygonOffset.h>
-#include <Inventor/nodes/SoDrawStyle.h>
+# include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoIndexedPointSet.h>
+# include <Inventor/nodes/SoIndexedLineSet.h>
+# include <Inventor/nodes/SoIndexedFaceSet.h>
+# include <Inventor/nodes/SoIndexedTriangleStripSet.h>
+# include <Inventor/nodes/SoShapeHints.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoNormal.h>
+# include <Inventor/nodes/SoSeparator.h>
+# include <Inventor/nodes/SoPointSet.h>
+# include <Inventor/nodes/SoPolygonOffset.h>
+# include <Inventor/nodes/SoDrawStyle.h>
+
+# include <vtkPointData.h>
+# include <vtkCellArray.h>
+# include <vtkCellData.h>
+# include <vtkLookupTable.h>
+
+# include <QMessageBox>
 #endif
 
 #include "ViewProviderFemPostObject.h"
@@ -48,12 +55,6 @@
 #include <Gui/Document.h>
 #include <Gui/SoFCColorBar.h>
 
-#include <vtkPointData.h>
-#include <vtkCellArray.h>
-#include <vtkCellData.h>
-#include <vtkLookupTable.h>
-#include <QMessageBox>
-
 using namespace FemGui;