diff --git a/src/Mod/Part/Gui/TaskAttacher.cpp b/src/Mod/Part/Gui/TaskAttacher.cpp
index 27bbc6066f..e53a416f62 100644
--- a/src/Mod/Part/Gui/TaskAttacher.cpp
+++ b/src/Mod/Part/Gui/TaskAttacher.cpp
@@ -21,42 +21,35 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <sstream>
-# include <QRegExp>
-# include <QTextStream>
 # include <QMessageBox>
-# include <Precision.hxx>
+# include <QRegExp>
 # include <Standard_Failure.hxx>
 #endif
 
-#include <Base/Console.h>
-#include <Base/Interpreter.h>
 #include <App/Application.h>
 #include <App/Document.h>
-#include <Gui/DocumentObserver.h>
-#include <App/Origin.h>
+#include <App/ObjectIdentifier.h>
 #include <App/OriginFeature.h>
 #include <App/Part.h>
-#include <App/ObjectIdentifier.h>
-#include <App/PropertyExpressionEngine.h>
 #include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Gui/Selection.h>
 #include <Gui/CommandT.h>
-#include <Mod/Part/Gui/TaskAttacher.h>
-#include <Mod/Part/Gui/AttacherTexts.h>
+#include <Gui/Document.h>
+#include <Gui/DocumentObserver.h>
+#include <Gui/Selection.h>
+#include <Gui/ViewProvider.h>
 #include <Mod/Part/App/AttachExtension.h>
 #include <Mod/Part/App/DatumFeature.h>
+#include <Mod/Part/Gui/AttacherTexts.h>
+#include <Mod/Part/Gui/TaskAttacher.h>
 
-#include "ui_TaskAttacher.h"
 #include "TaskAttacher.h"
+#include "ui_TaskAttacher.h"
+
 
 using namespace PartGui;
 using namespace Gui;
diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp
index b78c296f44..dcec2494ef 100644
--- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp
+++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp
@@ -22,55 +22,53 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QBoxLayout>
+# include <QCheckBox>
 # include <QCoreApplication>
 # include <QHeaderView>
-# include <QTextEdit>
-# include <QCheckBox>
+# include <QPushButton>
 # include <QScrollBar>
+# include <QTextEdit>
 # include <QTextStream>
 # include <QThread>
-# include <QTreeWidget>
-# include <QPushButton>
+# include <QTreeView>
 # include <Standard_Version.hxx>
-# include <BRepCheck_Analyzer.hxx>
-# include <BRepCheck_Result.hxx>
-# include <BRepCheck_ListIteratorOfListOfStatus.hxx>
-# include <BRepBuilderAPI_Copy.hxx>
-# include <BRepTools_ShapeSet.hxx>
+# include <Bnd_Box.hxx>
 # include <BOPAlgo_ArgumentAnalyzer.hxx>
 # include <BOPAlgo_ListOfCheckResult.hxx>
-
+# include <BRepBndLib.hxx>
+# include <BRepBuilderAPI_Copy.hxx>
+# include <BRepCheck_Analyzer.hxx>
+# include <BRepCheck_ListIteratorOfListOfStatus.hxx>
+# include <BRepCheck_Result.hxx>
+# include <BRepTools_ShapeSet.hxx>
+# include <ShapeAnalysis_FreeBounds.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Compound.hxx>
 # include <TopTools_IndexedMapOfShape.hxx>
 # include <TopExp.hxx>
 # include <TopExp_Explorer.hxx>
-# include <Bnd_Box.hxx>
-# include <BRepBndLib.hxx>
-# include <ShapeAnalysis_FreeBounds.hxx>
-# include <gp_Trsf.hxx>
+# include <Inventor/nodes/SoCube.h>
+# include <Inventor/nodes/SoDrawStyle.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoResetTransform.h>
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoSwitch.h>
-# include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/nodes/SoCube.h>
-# include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoTransform.h>
-# include <Inventor/nodes/SoResetTransform.h>
 #endif //_PreComp_
 
-#include "../App/PartFeature.h"
-#include "../App/TopoShapePy.h"
 #include <Base/Interpreter.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/Selection.h>
-#include <Gui/Document.h>
 #include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Document.h>
+#include <Gui/MainWindow.h>
+#include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
-#include <Gui/MainWindow.h>
+#include <Mod/Part/App/PartFeature.h>
+
 #include "TaskCheckGeometry.h"
 
+
 using namespace PartGui;
 
 QVector<QString> buildShapeEnumVector()
diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.h b/src/Mod/Part/Gui/TaskCheckGeometry.h
index 78c64d7cbd..bfd6ff8855 100644
--- a/src/Mod/Part/Gui/TaskCheckGeometry.h
+++ b/src/Mod/Part/Gui/TaskCheckGeometry.h
@@ -25,6 +25,9 @@
 
 #include <functional>
 #include <tuple>
+#include <QAbstractItemModel>
+#include <QElapsedTimer>
+#include <QProgressDialog>
 #include <BRepCheck_Analyzer.hxx>
 #include <BRepCheck_Status.hxx>
 #include <Message_ProgressIndicator.hxx>
@@ -32,9 +35,7 @@
 #include <TopTools_MapOfShape.hxx>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <QAbstractItemModel>
-#include <QProgressDialog>
-#include <QElapsedTimer>
+
 
 class SoSeparator;
 class SoSwitch;
diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp
index 5f8a4777e4..bbafd129bb 100644
--- a/src/Mod/Part/Gui/TaskDimension.cpp
+++ b/src/Mod/Part/Gui/TaskDimension.cpp
@@ -20,65 +20,65 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreCpmp_
 # include <QButtonGroup>
 # include <QPushButton>
 # include <sstream>
-# include <TopoDS_Shape.hxx>
-# include <TopoDS_Vertex.hxx>
+# include <BRep_Tool.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
+# include <Geom_CylindricalSurface.hxx>
+# include <Geom_ElementarySurface.hxx>
+# include <Geom_Line.hxx>
+# include <Geom_SphericalSurface.hxx>
+# include <GeomAPI_ExtremaCurveCurve.hxx>
+# include <GeomAPI_ProjectPointOnCurve.hxx>
+# include <TopExp.hxx>
+# include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
 # include <TopoDS_Face.hxx>
-# include <TopoDS.hxx>
-# include <BRepExtrema_DistShapeShape.hxx>
-# include <BRep_Tool.hxx>
-# include <TopExp.hxx>
-# include <Geom_ElementarySurface.hxx>
-# include <Geom_CylindricalSurface.hxx>
-# include <Geom_SphericalSurface.hxx>
-# include <Geom_Line.hxx>
-# include <GeomAPI_ProjectPointOnCurve.hxx>
-# include <GeomAPI_ExtremaCurveCurve.hxx>
+# include <TopoDS_Shape.hxx>
+# include <TopoDS_Vertex.hxx>
+
+# include <Inventor/engines/SoCalculator.h>
+# include <Inventor/engines/SoComposeVec3f.h>
+# include <Inventor/engines/SoConcatenate.h>
+# include <Inventor/engines/SoComposeRotation.h>
+# include <Inventor/engines/SoComposeRotationFromTo.h>
 
-# include <Inventor/nodes/SoTransform.h>
-# include <Inventor/nodes/SoMatrixTransform.h>
-# include <Inventor/nodes/SoVertexProperty.h>
-# include <Inventor/nodes/SoLineSet.h>
-# include <Inventor/nodes/SoIndexedLineSet.h>
-# include <Inventor/nodes/SoText2.h>
-# include <Inventor/nodes/SoFont.h>
-# include <Inventor/nodes/SoAnnotation.h>
 # include <Inventor/nodekits/SoShapeKit.h>
-# include <Inventor/nodes/SoSeparator.h>
+# include <Inventor/nodes/SoAnnotation.h>
 # include <Inventor/nodes/SoCone.h>
 # include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoNurbsCurve.h>
-# include <Inventor/engines/SoComposeVec3f.h>
-# include <Inventor/engines/SoCalculator.h>
-# include <Inventor/nodes/SoResetTransform.h>
-# include <Inventor/engines/SoConcatenate.h>
-# include <Inventor/engines/SoComposeRotationFromTo.h>
-# include <Inventor/engines/SoComposeRotation.h>
+# include <Inventor/nodes/SoFont.h>
+# include <Inventor/nodes/SoIndexedLineSet.h>
+# include <Inventor/nodes/SoLineSet.h>
 # include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoMatrixTransform.h>
 # include <Inventor/nodes/SoPickStyle.h>
+# include <Inventor/nodes/SoResetTransform.h>
+# include <Inventor/nodes/SoSeparator.h>
+# include <Inventor/nodes/SoText2.h>
+# include <Inventor/nodes/SoTransform.h>
+# include <Inventor/nodes/SoVertexProperty.h>
 #endif
 
+#include <App/Document.h>
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/UnitsApi.h>
-#include "../App/PartFeature.h"
-#include <App/Document.h>
 #include <Gui/Application.h>
-#include <Gui/Selection.h>
 #include <Gui/Document.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Control.h>
+#include <Gui/Selection.h>
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
+#include <Mod/Part/App/PartFeature.h>
 
 #include "TaskDimension.h"
 
+
 namespace bp = boost::placeholders;
 
 static bool _MeasureInfoInited;
diff --git a/src/Mod/Part/Gui/TaskDimension.h b/src/Mod/Part/Gui/TaskDimension.h
index de0cb3d9f8..7daaeeb3b1 100644
--- a/src/Mod/Part/Gui/TaskDimension.h
+++ b/src/Mod/Part/Gui/TaskDimension.h
@@ -23,22 +23,23 @@
 #ifndef TASKDIMENSION_H
 #define TASKDIMENSION_H
 
-#include <gp_Vec.hxx>
 #include <gp_Lin.hxx>
+#include <gp_Vec.hxx>
 
-#include <Inventor/fields/SoSFVec3f.h>
-#include <Inventor/fields/SoSFMatrix.h>
-#include <Inventor/fields/SoSFString.h>
-#include <Inventor/nodekits/SoSeparatorKit.h>
-#include <Inventor/fields/SoSFColor.h>
-#include <Inventor/fields/SoSFRotation.h>
-#include <Inventor/fields/SoSFFloat.h>
 #include <Inventor/engines/SoSubEngine.h>
 #include <Inventor/engines/SoEngine.h>
+#include <Inventor/fields/SoSFColor.h>
+#include <Inventor/fields/SoSFFloat.h>
+#include <Inventor/fields/SoSFMatrix.h>
+#include <Inventor/fields/SoSFRotation.h>
+#include <Inventor/fields/SoSFString.h>
+#include <Inventor/fields/SoSFVec3f.h>
+#include <Inventor/nodekits/SoSeparatorKit.h>
 
+#include <Base/Matrix.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Base/Matrix.h>
+
 
 class TopoDS_Shape;
 class TopoDS_Face;
diff --git a/src/Mod/Part/Gui/TaskOffset.cpp b/src/Mod/Part/Gui/TaskOffset.cpp
index 2cfdf4f74d..0701a0e7fc 100644
--- a/src/Mod/Part/Gui/TaskOffset.cpp
+++ b/src/Mod/Part/Gui/TaskOffset.cpp
@@ -20,33 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <QMessageBox>
-# include <QTextStream>
 #endif
 
-#include "ui_TaskOffset.h"
-#include "TaskOffset.h"
-
+#include <App/Application.h>
+#include <App/Document.h>
+#include <App/DocumentObject.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/CommandT.h>
 #include <Gui/Document.h>
-#include <Gui/Selection.h>
-#include <Gui/SelectionFilter.h>
 #include <Gui/ViewProvider.h>
-
-#include <Base/Console.h>
-#include <Base/Interpreter.h>
-#include <Base/UnitsApi.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
 #include <Mod/Part/App/FeatureOffset.h>
 
+#include "TaskOffset.h"
+#include "ui_TaskOffset.h"
+
 
 using namespace PartGui;
 
diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.h b/src/Mod/Part/Gui/TaskShapeBuilder.h
index 0daf4267f0..2bb7a9e27a 100644
--- a/src/Mod/Part/Gui/TaskShapeBuilder.h
+++ b/src/Mod/Part/Gui/TaskShapeBuilder.h
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PARTGUI_TASKSHAPEBUILDER_H
 #define PARTGUI_TASKSHAPEBUILDER_H
 
-#include <Gui/TaskView/TaskView.h>
-#include <Gui/TaskView/TaskDialog.h>
 #include <Gui/Selection.h>
+#include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
+
 
 namespace PartGui { 
 
diff --git a/src/Mod/Part/Gui/TaskThickness.cpp b/src/Mod/Part/Gui/TaskThickness.cpp
index f3eebf4bd6..41ceb30f88 100644
--- a/src/Mod/Part/Gui/TaskThickness.cpp
+++ b/src/Mod/Part/Gui/TaskThickness.cpp
@@ -20,35 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QMessageBox>
-# include <QTextStream>
 #endif
 
-#include "ui_TaskOffset.h"
-#include "TaskThickness.h"
-
+#include <App/Application.h>
+#include <App/Document.h>
+#include <App/DocumentObject.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
 #include <Gui/CommandT.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
 #include <Gui/SelectionObject.h>
 #include <Gui/ViewProvider.h>
-
-#include <Base/Console.h>
-#include <Base/Interpreter.h>
-#include <Base/Tools.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
-#include <Gui/Command.h>
 #include <Mod/Part/App/PartFeatures.h>
 
+#include "TaskThickness.h"
+#include "ui_TaskOffset.h"
+
 
 using namespace PartGui;