diff --git a/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp b/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp
index b9c29a973d..a90419d2ae 100644
--- a/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp
+++ b/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp
@@ -21,19 +21,12 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <QString>
-# include <QSlider>
 
-# include <Standard_math.hxx>
-#endif
-
-#include "ui_TaskAnalysisInfo.h"
-#include "TaskAnalysisInfo.h"
-#include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/BitmapFactory.h>
 
+#include "TaskAnalysisInfo.h"
+#include "ui_TaskAnalysisInfo.h"
+
 
 using namespace FemGui;
 using namespace Gui;
diff --git a/src/Mod/Fem/Gui/TaskAnalysisInfo.h b/src/Mod/Fem/Gui/TaskAnalysisInfo.h
index 6d48f3db5a..2f63e814c4 100644
--- a/src/Mod/Fem/Gui/TaskAnalysisInfo.h
+++ b/src/Mod/Fem/Gui/TaskAnalysisInfo.h
@@ -24,7 +24,6 @@
 #define FEMGUI_TaskAnalysisInfo_H
 
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/Fem/App/FemSetNodesObject.h>
 
 
 class Ui_TaskAnalysisInfo;
diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
index bc07cd08a1..4f03e68787 100644
--- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
+++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
@@ -20,39 +20,33 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #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 <Inventor/nodes/SoCamera.h>
+# include <Inventor/nodes/SoEventCallback.h>
 
 # include <SMESH_Mesh.hxx>
 # include <SMESHDS_Mesh.hxx>
-# include <SMDSAbs_ElementType.hxx>
+# include <Standard_math.hxx>
 #endif
 
-#include "ui_TaskCreateNodeSet.h"
-#include "TaskCreateNodeSet.h"
-#include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
 #include <Base/Console.h>
+#include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Document.h>
+#include <Gui/Utilities.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-#include <Gui/Utilities.h>
-
+#include <Gui/ViewProvider.h>
+#include <Gui/WaitCursor.h>
 #include <Mod/Fem/App/FemMeshObject.h>
 #include <Mod/Fem/App/FemSetNodesObject.h>
-#include "ViewProviderFemMesh.h"
+
+#include "TaskCreateNodeSet.h"
+#include "ui_TaskCreateNodeSet.h"
 #include "FemSelectionGate.h"
+#include "ViewProviderFemMesh.h"
 
 
 using namespace FemGui;
diff --git a/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp b/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp
index cc182acf6a..7787db39c3 100644
--- a/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp
+++ b/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp
@@ -20,30 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include "TaskDlgAnalysis.h"
-
 #include <Base/Console.h>
 #include <Base/Exception.h>
-#include <Gui/TaskView/TaskSelectLinkProperty.h>
 #include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/Command.h>
-
+#include <Gui/Document.h>
 #include <Mod/Fem/App/FemAnalysis.h>
 
+#include "TaskDlgAnalysis.h"
 #include "TaskAnalysisInfo.h"
 #include "TaskDriver.h"
 
 
 using namespace FemGui;
 
-
 //**************************************************************************
 //**************************************************************************
 // TaskDialog
diff --git a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp
index 52b963ef99..9e32a5dfbd 100644
--- a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp
+++ b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp
@@ -20,20 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include "TaskDlgCreateNodeSet.h"
-
 #include <Base/Console.h>
 #include <Base/Exception.h>
-#include <Gui/TaskView/TaskSelectLinkProperty.h>
 #include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/Command.h>
+#include <Gui/Document.h>
+
+#include "TaskDlgCreateNodeSet.h"
 #include "ViewProviderFemMesh.h"
 
 
diff --git a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp
index fb09d6949a..50582bc629 100644
--- a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp
+++ b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp
@@ -20,32 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <QMessageBox>
 #endif
 
-#include "TaskDlgMeshShapeNetgen.h"
-
 #include <Base/Console.h>
 #include <Base/Exception.h>
-#include <Gui/TaskView/TaskSelectLinkProperty.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Command.h>
 #include <Gui/MainWindow.h>
 #include <Gui/WaitCursor.h>
+#include <Mod/Fem/App/FemMeshShapeNetgenObject.h>
 
+#include "TaskDlgMeshShapeNetgen.h"
+#include "TaskTetParameter.h"
 #include "ViewProviderFemMeshShapeNetgen.h"
 
-#include <Mod/Fem/App/FemMeshShapeNetgenObject.h>
-#include "TaskTetParameter.h"
 
 using namespace FemGui;
 
-
 //**************************************************************************
 //**************************************************************************
 // TaskDialog
diff --git a/src/Mod/Fem/Gui/TaskDriver.cpp b/src/Mod/Fem/Gui/TaskDriver.cpp
index 37a991eddf..aa02097a3b 100644
--- a/src/Mod/Fem/Gui/TaskDriver.cpp
+++ b/src/Mod/Fem/Gui/TaskDriver.cpp
@@ -21,24 +21,11 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Standard_math.hxx>
 
-# include <QString>
-# include <QSlider>
-#endif
-
-#include "ui_TaskDriver.h"
-#include "TaskDriver.h"
-#include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Base/Console.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
-#include <Gui/Utilities.h>
+
+#include "TaskDriver.h"
+#include "ui_TaskDriver.h"
 
 
 using namespace FemGui;
diff --git a/src/Mod/Fem/Gui/TaskObjectName.cpp b/src/Mod/Fem/Gui/TaskObjectName.cpp
index 4109ebc6c6..f5e6370735 100644
--- a/src/Mod/Fem/Gui/TaskObjectName.cpp
+++ b/src/Mod/Fem/Gui/TaskObjectName.cpp
@@ -20,25 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <QString>
-# include <QSlider>
 #endif
 
-
-#include "ui_TaskObjectName.h"
-#include "TaskObjectName.h"
-#include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Base/Console.h>
-#include <Gui/Selection.h>
+#include <Gui/Document.h>
+
+#include "TaskObjectName.h"
+#include "ui_TaskObjectName.h"
 
 
 using namespace FemGui;
diff --git a/src/Mod/Fem/Gui/TaskObjectName.h b/src/Mod/Fem/Gui/TaskObjectName.h
index 39c0369eda..181dbdd1c1 100644
--- a/src/Mod/Fem/Gui/TaskObjectName.h
+++ b/src/Mod/Fem/Gui/TaskObjectName.h
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskObjectName_H
 #define GUI_TASKVIEW_TaskObjectName_H
 
 #include <Gui/TaskView/TaskView.h>
 
 
-
 class Ui_TaskObjectName;
 
 namespace App {
diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
index 4790bba647..f74cc9256a 100644
--- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp
+++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
@@ -32,7 +32,6 @@
 
 # include <QApplication>
 # include <QMessageBox>
-# include <QSlider>
 # include <QToolTip>
 #endif
 
@@ -58,9 +57,8 @@
 #include "ui_TaskPostScalarClip.h"
 #include "ui_TaskPostWarpVector.h"
 
-#include "FemSettings.h"
 #include "TaskPostBoxes.h"
-#include "ViewProviderFemPostFilter.h"
+#include "FemSettings.h"
 #include "ViewProviderFemPostFunction.h"
 #include "ViewProviderFemPostObject.h"
 
diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.h b/src/Mod/Fem/Gui/TaskPostBoxes.h
index 38ace8c56c..9f10bffadd 100644
--- a/src/Mod/Fem/Gui/TaskPostBoxes.h
+++ b/src/Mod/Fem/Gui/TaskPostBoxes.h
@@ -23,7 +23,6 @@
 #ifndef GUI_TASKVIEW_TaskPostDisplay_H
 #define GUI_TASKVIEW_TaskPostDisplay_H
 
-#include <App/DocumentObserver.h>
 #include <Gui/DocumentObserver.h>
 #include <Gui/ViewProviderDocumentObject.h>
 #include <Gui/TaskView/TaskDialog.h>
diff --git a/src/Mod/Fem/Gui/TaskTetParameter.cpp b/src/Mod/Fem/Gui/TaskTetParameter.cpp
index 1a50d93f9e..27b7725c0e 100644
--- a/src/Mod/Fem/Gui/TaskTetParameter.cpp
+++ b/src/Mod/Fem/Gui/TaskTetParameter.cpp
@@ -20,34 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QString>
-# include <QSlider>
-
-# include <Standard_math.hxx>
 #endif
 
-#include "ui_TaskTetParameter.h"
-#include "TaskTetParameter.h"
-#include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Base/Console.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
-#include <Gui/Utilities.h>
-#include <Mod/Fem/App/FemMeshShapeNetgenObject.h>
 #include <Mod/Fem/App/FemMesh.h>
+#include <Mod/Fem/App/FemMeshShapeNetgenObject.h>
+
+#include "TaskTetParameter.h"
+#include "ui_TaskTetParameter.h"
 
 
 using namespace FemGui;
 using namespace Gui;
 
-
 TaskTetParameter::TaskTetParameter(Fem::FemMeshShapeNetgenObject *pcObject,QWidget *parent)
     : TaskBox(Gui::BitmapFactory().pixmap("FEM_CreateNodesSet"),
       tr("Tet Parameter"),
@@ -94,11 +82,12 @@ TaskTetParameter::~TaskTetParameter()
 
 void TaskTetParameter::SwitchMethod(int Value)
 {
-    if(Value == 5){
+    if (Value == 5) {
         ui->doubleSpinBox_GrowthRate->setEnabled(true);
         ui->spinBox_SegsPerEdge->setEnabled(true);
         ui->spinBox_SegsPerRadius->setEnabled(true);
-    }else{
+    }
+    else {
         ui->doubleSpinBox_GrowthRate->setEnabled(false);
         ui->spinBox_SegsPerEdge->setEnabled(false);
         ui->spinBox_SegsPerRadius->setEnabled(false);
@@ -151,15 +140,10 @@ void TaskTetParameter::setInfo()
 {
     Fem::FemMesh::FemMeshInfo info = pcObject->FemMesh.getValue().getInfo();
     //Base::BoundBox3d bndBox = pcObject->FemMesh.getValue().getBoundBox();
-
-
     ui->lineEdit_InfoNodes      ->setText(QString::number(info.numNode));
     ui->lineEdit_InfoTriangle   ->setText(QString::number(info.numFaces));
     ui->lineEdit_InfoTet        ->setText(QString::number(info.numTetr));
 }
 
 
-
-
-
 #include "moc_TaskTetParameter.cpp"