diff --git a/src/App/PropertyFile.cpp b/src/App/PropertyFile.cpp
index 60870f1b79..9944d637fb 100644
--- a/src/App/PropertyFile.cpp
+++ b/src/App/PropertyFile.cpp
@@ -278,15 +278,17 @@ bool isIOFile(PyObject* file)
 
 void PropertyFileIncluded::setPyObject(PyObject *value)
 {
-    std::string string;
     if (PyUnicode_Check(value)) {
-        string = PyUnicode_AsUTF8(value);
+        std::string string = PyUnicode_AsUTF8(value);
+        setValue(string.c_str());
     }
     else if (PyBytes_Check(value)) {
-        string = PyBytes_AsString(value);
+        std::string string = PyBytes_AsString(value);
+        setValue(string.c_str());
     }
     else if (isIOFile(value)){
-        string = getNameFromFile(value);
+        std::string string = getNameFromFile(value);
+        setValue(string.c_str());
     }
     else if (PyTuple_Check(value)) {
         if (PyTuple_Size(value) != 2)
@@ -329,16 +331,22 @@ void PropertyFileIncluded::setPyObject(PyObject *value)
         }
 
         setValue(fileStr.c_str(),nameStr.c_str());
-        return;
+    }
+    else if (PyDict_Check(value)) {
+        Py::Dict dict(value);
+        if (dict.hasKey("filter")) {
+            setFilter(Py::String(dict.getItem("filter")));
+        }
+        if (dict.hasKey("filename")) {
+            std::string string = static_cast<std::string>(Py::String(dict.getItem("filename")));
+            setValue(string.c_str());
+        }
     }
     else {
         std::string error = std::string("Type must be string or file, not ");
         error += value->ob_type->tp_name;
         throw Base::TypeError(error);
     }
-
-    // assign the string
-    setValue(string.c_str());
 }
 
 void PropertyFileIncluded::Save (Base::Writer &writer) const
@@ -569,6 +577,16 @@ unsigned int PropertyFileIncluded::getMemSize () const
     return mem;
 }
 
+void PropertyFileIncluded::setFilter(std::string filter)
+{
+    m_filter = std::move(filter);
+}
+
+std::string PropertyFileIncluded::getFilter() const
+{
+    return m_filter;
+}
+
 //**************************************************************************
 // PropertyFile
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -592,3 +610,20 @@ std::string PropertyFile::getFilter() const
     return m_filter;
 }
 
+void PropertyFile::setPyObject(PyObject *value)
+{
+    if (PyDict_Check(value)) {
+        Py::Dict dict(value);
+        if (dict.hasKey("filter")) {
+            setFilter(Py::String(dict.getItem("filter")));
+        }
+        if (dict.hasKey("filename")) {
+            std::string string = static_cast<std::string>(Py::String(dict.getItem("filename")));
+            setValue(string.c_str());
+        }
+    }
+    else {
+        PropertyString::setPyObject(value);
+    }
+}
+
diff --git a/src/App/PropertyFile.h b/src/App/PropertyFile.h
index e593f5cf19..3806b09bf8 100644
--- a/src/App/PropertyFile.h
+++ b/src/App/PropertyFile.h
@@ -50,6 +50,7 @@ public:
     const char* getEditorName() const override
     { return "Gui::PropertyEditor::PropertyFileItem"; }
 
+    void setPyObject(PyObject *) override;
     virtual void setFilter(const std::string filter);
     virtual std::string getFilter() const;
 
@@ -86,7 +87,7 @@ public:
     { return "Gui::PropertyEditor::PropertyTransientFileItem"; }
     PyObject *getPyObject() override;
     void setPyObject(PyObject *) override;
-    
+
     void Save (Base::Writer &writer) const override;
     void Restore(Base::XMLReader &reader) override;
 
@@ -116,6 +117,9 @@ public:
 
     bool isEmpty() const {return _cValue.empty();}
 
+    void setFilter(std::string filter);
+    std::string getFilter() const;
+
 protected:
     // get the transient path if the property is in a DocumentObject
     std::string getDocTransientPath() const;
@@ -126,6 +130,9 @@ protected:
     mutable std::string _cValue;
     mutable std::string _BaseFileName;
     mutable std::string _OriginalName;
+
+private:
+    std::string m_filter;
 };
 
 
diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp
index ea4c74f608..63f1495ee7 100644
--- a/src/Gui/propertyeditor/PropertyItem.cpp
+++ b/src/Gui/propertyeditor/PropertyItem.cpp
@@ -4247,6 +4247,16 @@ void PropertyTransientFileItem::setEditorData(QWidget *editor, const QVariant& d
 {
     auto fc = qobject_cast<Gui::FileChooser*>(editor);
     fc->setFileName(data.toString());
+
+    const auto prop = static_cast
+        <const App::PropertyFileIncluded*>(getFirstProperty());
+
+    if (prop) {
+        std::string filter = prop->getFilter();
+        if (!filter.empty()) {
+            fc->setFilter(QString::fromStdString(filter));
+        }
+    }
 }
 
 QVariant PropertyTransientFileItem::editorData(QWidget *editor) const
diff --git a/src/Mod/Mesh/App/Core/MeshIO.cpp b/src/Mod/Mesh/App/Core/MeshIO.cpp
index 531e47dccb..402bdcb04a 100644
--- a/src/Mod/Mesh/App/Core/MeshIO.cpp
+++ b/src/Mod/Mesh/App/Core/MeshIO.cpp
@@ -2687,14 +2687,16 @@ bool MeshOutput::SaveInventor (std::ostream &rstrOut) const
     // Header info
     Base::InventorBuilder builder(rstrOut);
     builder.beginSeparator();
-    builder.addInfo("Created by FreeCAD <http://www.freecadweb.org>");
+    Base::InfoItem info{"Created by FreeCAD <http://www.freecadweb.org>"};
+    builder.addNode(info);
     std::stringstream str;
     str << "Triangle mesh contains "
         << _rclMesh.CountPoints()
         << " vertices and "
         << _rclMesh.CountFacets()
         << " faces";
-    builder.addLabel(str.str().c_str());
+    Base::LabelItem label{str.str().c_str()};
+    builder.addNode(label);
 
     // write out the normals of the facets
     builder.beginNormal();
diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp
index f02815ae6e..f538576ff6 100644
--- a/src/Mod/Part/App/TopoShape.cpp
+++ b/src/Mod/Part/App/TopoShape.cpp
@@ -107,6 +107,7 @@
 # include <GeomFill_SectionLaw.hxx>
 # include <GeomFill_Sweep.hxx>
 # include <GeomLib.hxx>
+# include <GeomLib_IsPlanarSurface.hxx>
 # include <gp_Circ.hxx>
 # include <gp_Pln.hxx>
 # include <GProp_GProps.hxx>
@@ -4189,6 +4190,27 @@ bool TopoShape::isInfinite() const
     }
 }
 
+bool TopoShape::isPlanar(double tol) const
+{
+    if (_Shape.IsNull() || _Shape.ShapeType() != TopAbs_FACE) {
+        return false;
+    }
+
+    BRepAdaptor_Surface adapt(TopoDS::Face(_Shape));
+    if (adapt.GetType() == GeomAbs_Plane) {
+        return true;
+    }
+
+    TopLoc_Location loc;
+    Handle(Geom_Surface) surf = BRep_Tool::Surface(TopoDS::Face(_Shape), loc);
+    if (surf.IsNull()) {
+        return false;
+    }
+
+    GeomLib_IsPlanarSurface check(surf, tol);
+    return check.IsPlanar();
+}
+
 bool TopoShape::isCoplanar(const TopoShape &other, double tol) const {
     if(isNull() || other.isNull())
         return false;
diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h
index 91b8e9bc5e..bf608f6159 100644
--- a/src/Mod/Part/App/TopoShape.h
+++ b/src/Mod/Part/App/TopoShape.h
@@ -228,6 +228,8 @@ public:
     bool findPlane(gp_Pln &pln, double tol=-1) const;
     /// Returns true if the expansion of the shape is infinite, false otherwise
     bool isInfinite() const;
+    /// Checks whether the shape is a planar face
+    bool isPlanar(double tol = 1.0e-7) const;
     //@}
 
     /** @name Boolean operation*/
diff --git a/src/Mod/Robot/Gui/AppRobotGui.cpp b/src/Mod/Robot/Gui/AppRobotGui.cpp
index fcae584436..cd1b858a82 100644
--- a/src/Mod/Robot/Gui/AppRobotGui.cpp
+++ b/src/Mod/Robot/Gui/AppRobotGui.cpp
@@ -22,19 +22,17 @@
 
 #include "PreCompiled.h"
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
+
+#include "ViewProviderEdge2TracObject.h"
 #include "ViewProviderRobotObject.h"
 #include "ViewProviderTrajectory.h"
-#include "ViewProviderEdge2TracObject.h"
-#include "ViewProviderTrajectoryDressUp.h"
 #include "ViewProviderTrajectoryCompound.h"
+#include "ViewProviderTrajectoryDressUp.h"
 #include "Workbench.h"
 
 
diff --git a/src/Mod/Robot/Gui/Command.cpp b/src/Mod/Robot/Gui/Command.cpp
index 0065469030..c6c007fd1e 100644
--- a/src/Mod/Robot/Gui/Command.cpp
+++ b/src/Mod/Robot/Gui/Command.cpp
@@ -20,28 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QMessageBox>
 #endif
 
-#include <App/Application.h>
 #include <Gui/Application.h>
-#include <Gui/MainWindow.h>
 #include <Gui/Command.h>
-#include <Gui/FileDialog.h>
+#include <Gui/Control.h>
+#include <Gui/Document.h>
+#include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
-#include <Gui/SelectionObject.h>
-#include <Gui/Document.h>
-#include <Gui/Control.h>
-
 #include <Mod/Robot/App/RobotObject.h>
 #include <Mod/Robot/App/TrajectoryObject.h>
 
-#include "TrajectorySimulate.h"
 #include "TaskDlgSimulate.h"
+#include "TrajectorySimulate.h"
 
 
 using namespace std;
diff --git a/src/Mod/Robot/Gui/CommandExport.cpp b/src/Mod/Robot/Gui/CommandExport.cpp
index 4b791c2acd..b7f6a89613 100644
--- a/src/Mod/Robot/Gui/CommandExport.cpp
+++ b/src/Mod/Robot/Gui/CommandExport.cpp
@@ -20,24 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QMessageBox>
 #endif
 
-#include <App/Application.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
-#include <Gui/MainWindow.h>
-#include <Gui/FileDialog.h>
-#include <Gui/Selection.h>
 #include <Gui/Document.h>
-
+#include <Gui/FileDialog.h>
+#include <Gui/MainWindow.h>
+#include <Gui/Selection.h>
 #include <Mod/Robot/App/RobotObject.h>
 #include <Mod/Robot/App/TrajectoryObject.h>
 
-#include "TrajectorySimulate.h"
 
 using namespace std;
 
diff --git a/src/Mod/Robot/Gui/CommandInsertRobot.cpp b/src/Mod/Robot/Gui/CommandInsertRobot.cpp
index b6ff92c5de..48645128f8 100644
--- a/src/Mod/Robot/Gui/CommandInsertRobot.cpp
+++ b/src/Mod/Robot/Gui/CommandInsertRobot.cpp
@@ -20,26 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QMessageBox>
 #endif
 
-#include <App/Application.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
-#include <Gui/MainWindow.h>
-#include <Gui/FileDialog.h>
-#include <Gui/Selection.h>
 #include <Gui/Document.h>
-
+#include <Gui/MainWindow.h>
+#include <Gui/Selection.h>
 #include <Mod/Robot/App/RobotObject.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
-
 
 #include "TrajectorySimulate.h"
 
+
 using namespace std;
 
 DEF_STD_CMD_A(CmdRobotInsertKukaIR500)
diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp
index 868e761f34..3836bf0db2 100644
--- a/src/Mod/Robot/Gui/CommandTrajectory.cpp
+++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp
@@ -20,33 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QInputDialog>
 # include <QMessageBox>
 #endif
 
-#include <App/Application.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
-#include <Gui/MainWindow.h>
-#include <Gui/FileDialog.h>
-#include <Gui/Selection.h>
 #include <Gui/Document.h>
+#include <Gui/MainWindow.h>
 #include <Gui/Placement.h>
-#include <Gui/Control.h>
-
-
-#include <Mod/Part/App/PartFeature.h>
-#include <Mod/Robot/App/RobotObject.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
+#include <Gui/Selection.h>
 #include <Mod/Robot/App/Edge2TracObject.h>
-#include <Mod/Robot/App/TrajectoryDressUpObject.h>
+#include <Mod/Robot/App/RobotObject.h>
 #include <Mod/Robot/App/TrajectoryCompound.h>
+#include <Mod/Robot/App/TrajectoryDressUpObject.h>
+#include <Mod/Robot/App/TrajectoryObject.h>
+
 #include "TaskDlgEdge2Trac.h"
 
-#include "TrajectorySimulate.h"
 
 using namespace std;
 using namespace RobotGui;
diff --git a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h
index 942f351060..e0dad2e726 100644
--- a/src/Mod/Robot/Gui/PreCompiled.h
+++ b/src/Mod/Robot/Gui/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef ROBOTGUI_PRECOMPILED_H
 #define ROBOTGUI_PRECOMPILED_H
 
@@ -31,7 +30,7 @@
 # define RobotExport    __declspec(dllimport)
 # define PartExport     __declspec(dllimport)
 # define PartGuiExport  __declspec(dllimport)
-# define RobotGuiExport    __declspec(dllexport)
+# define RobotGuiExport __declspec(dllexport)
 #else // for Linux
 # define PartExport
 # define RobotExport
@@ -42,37 +41,46 @@
 #include <Standard_math.hxx>
 
 #ifdef _MSC_VER
-#   pragma warning(disable : 4005)
-#   pragma warning(disable : 4273)
+# pragma warning(disable : 4005)
+# pragma warning(disable : 4273)
 #endif
 
 #ifdef _PreComp_
 
-// standard
-#include <iostream>
-#include <cassert>
-#include <cmath>
-
 // STL
-#include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
-#include <algorithm>
-#include <stack>
-#include <queue>
-#include <bitset>
+#include <sstream>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
 #endif
 
+// Qt
+#include <QAction>
+#include <QApplication>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QInputDialog>
+#include <QMenu>
+#include <QMessageBox>
+#include <qobject.h>
+#include <qpalette.h>
+#include <QString>
+#include <QTimer>
 
-// Qt Toolkit
-#ifndef __QtAll__
-# include <Gui/QtAll.h>
-#endif
+// Inventor
+#include <Inventor/SoDB.h>
+#include <Inventor/SoInput.h>
+#include <Inventor/SbVec3f.h>
+#include <Inventor/actions/SoSearchAction.h>
+#include <Inventor/draggers/SoJackDragger.h>
+#include <Inventor/nodes/SoBaseColor.h>
+#include <Inventor/nodes/SoCoordinate3.h>
+#include <Inventor/nodes/SoDrawStyle.h>
+#include <Inventor/nodes/SoLineSet.h>
+#include <Inventor/nodes/SoMarkerSet.h>
+#include <Inventor/nodes/SoSeparator.h>
+#include <Inventor/VRMLnodes/SoVRMLTransform.h>
 
 #endif //_PreComp_
 
diff --git a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp
index 76a95f89bd..5677a72b6c 100644
--- a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp
+++ b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp
@@ -20,25 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QApplication>
 #endif
 
-#include "TaskDlgEdge2Trac.h"
-
 #include <Base/Console.h>
 #include <Base/Exception.h>
-#include <Gui/TaskView/TaskSelectLinkProperty.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 
+#include <Gui/TaskView/TaskSelectLinkProperty.h>
+
+#include "TaskDlgEdge2Trac.h"
+
 
 using namespace RobotGui;
 
-
 //**************************************************************************
 //**************************************************************************
 // TaskDialog
diff --git a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h
index f7f0658ae0..daedc6e4e3 100644
--- a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h
+++ b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h
@@ -20,24 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef ROBOTGUI_TaskDlgEdge2Trac_H
 #define ROBOTGUI_TaskDlgEdge2Trac_H
 
 #include <Gui/TaskView/TaskDialog.h>
-#include <Mod/Robot/App/RobotObject.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
 #include <Mod/Robot/App/Edge2TracObject.h>
 
 #include "TaskEdge2TracParameter.h"
 
+
 // forward
 namespace Gui { namespace TaskView { class TaskSelectLinkProperty;}}
 
-
 namespace RobotGui {
 
-
 /// simulation dialog for the TaskView
 class RobotGuiExport TaskDlgEdge2Trac : public Gui::TaskView::TaskDialog
 {
diff --git a/src/Mod/Robot/Gui/TaskDlgSimulate.cpp b/src/Mod/Robot/Gui/TaskDlgSimulate.cpp
index 71eb5f22d4..79871a59f7 100644
--- a/src/Mod/Robot/Gui/TaskDlgSimulate.cpp
+++ b/src/Mod/Robot/Gui/TaskDlgSimulate.cpp
@@ -20,16 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "TaskDlgSimulate.h"
 
-using namespace RobotGui;
 
+using namespace RobotGui;
 
 //**************************************************************************
 //**************************************************************************
@@ -46,8 +42,9 @@ TaskDlgSimulate::TaskDlgSimulate(Robot::RobotObject *pcRobotObject,Robot::Trajec
     msg  = new TaskRobotMessages(pcRobotObject);
     
     
-    QObject::connect(trac ,SIGNAL(axisChanged(float,float,float,float,float,float,const Base::Placement &)),
-                     rob  ,SLOT  (setAxis(float,float,float,float,float,float,const Base::Placement &)));
+    QObject::connect(
+        trac, SIGNAL(axisChanged(float, float, float, float, float, float, const Base::Placement&)),
+        rob, SLOT(setAxis(float, float, float, float, float, float, const Base::Placement&)));
 
     Content.push_back(rob);
     Content.push_back(ctr);
diff --git a/src/Mod/Robot/Gui/TaskDlgSimulate.h b/src/Mod/Robot/Gui/TaskDlgSimulate.h
index e46a06506b..0b6c1d1402 100644
--- a/src/Mod/Robot/Gui/TaskDlgSimulate.h
+++ b/src/Mod/Robot/Gui/TaskDlgSimulate.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef ROBOTGUI_TASKDLGSIMULATE_H
 #define ROBOTGUI_TASKDLGSIMULATE_H
 
@@ -29,13 +28,13 @@
 #include <Mod/Robot/App/TrajectoryObject.h>
 
 #include "TaskRobot6Axis.h"
-#include "TaskTrajectory.h"
 #include "TaskRobotControl.h"
 #include "TaskRobotMessages.h"
+#include "TaskTrajectory.h"
+
 
 namespace RobotGui {
 
-
 /// simulation dialog for the TaskView
 class RobotGuiExport TaskDlgSimulate : public Gui::TaskView::TaskDialog
 {
diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp
index d207952fb8..a271676169 100644
--- a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp
+++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp
@@ -20,23 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QApplication>
 #endif
 
-#include "TaskDlgTrajectoryCompound.h"
-
-#include <Gui/TaskView/TaskSelectLinkProperty.h>
-#include <Gui/Document.h>
 #include <Gui/Application.h>
+#include <Gui/Document.h>
+#include <Gui/TaskView/TaskSelectLinkProperty.h>
+
+#include "TaskDlgTrajectoryCompound.h"
 
 
 using namespace RobotGui;
 
-
 //**************************************************************************
 //**************************************************************************
 // TaskDialog
diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h
index c777ab1616..81b073e339 100644
--- a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h
+++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef ROBOTGUI_TaskDlgTrajectoryCompound_H
 #define ROBOTGUI_TaskDlgTrajectoryCompound_H
 
@@ -31,10 +30,8 @@
 // forward
 namespace Gui { namespace TaskView { class TaskSelectLinkProperty;}}
 
-
 namespace RobotGui {
 
-
 /// simulation dialog for the TaskView
 class RobotGuiExport TaskDlgTrajectoryCompound : public Gui::TaskView::TaskDialog
 {
diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp
index ace5c2d993..36cfee3c6b 100644
--- a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp
+++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp
@@ -20,22 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
+#include <Gui/Application.h>
+#include <Gui/Document.h>
 
 #include "TaskDlgTrajectoryDressUp.h"
-#include <Gui/TaskView/TaskSelectLinkProperty.h>
-
-#include <Gui/Document.h>
-#include <Gui/Application.h>
 
 
 using namespace RobotGui;
 
-
 //**************************************************************************
 //**************************************************************************
 // TaskDialog
diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h
index 3add544ec1..6a4caae3a1 100644
--- a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h
+++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h
@@ -20,24 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef ROBOTGUI_TaskDlgTrajectoryDressUp_H
 #define ROBOTGUI_TaskDlgTrajectoryDressUp_H
 
 #include <Gui/TaskView/TaskDialog.h>
-#include <Mod/Robot/App/RobotObject.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
 #include <Mod/Robot/App/TrajectoryDressUpObject.h>
 
 #include "TaskTrajectoryDressUpParameter.h"
 
+
 // forward
 namespace Gui { namespace TaskView { class TaskSelectLinkProperty;}}
 
-
 namespace RobotGui {
 
-
 /// simulation dialog for the TaskView
 class RobotGuiExport TaskDlgTrajectoryDressUp : public Gui::TaskView::TaskDialog
 {
diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp b/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp
index 1ffe3fa893..0a97695656 100644
--- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp
+++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp
@@ -20,23 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <QString>
 #endif
 
-#include <QString>
-#include <QSlider>
+#include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Document.h>
+#include <Gui/ViewProvider.h>
+
 #include "ui_TaskEdge2TracParameter.h"
 #include "TaskEdge2TracParameter.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/Selection.h>
 
 
 using namespace RobotGui;
diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.h b/src/Mod/Robot/Gui/TaskEdge2TracParameter.h
index 675fb353a3..950b2ee188 100644
--- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.h
+++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.h
@@ -20,15 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskEdge2TracParameter_H
 #define GUI_TASKVIEW_TaskEdge2TracParameter_H
 
 #include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
-
 #include <Mod/Robot/App/Edge2TracObject.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
 
 
 class Ui_TaskEdge2TracParameter;
@@ -43,8 +39,6 @@ class ViewProvider;
 
 namespace RobotGui { 
 
-
-
 class TaskEdge2TracParameter : public Gui::TaskView::TaskBox
 {
     Q_OBJECT
diff --git a/src/Mod/Robot/Gui/TaskRobot6Axis.cpp b/src/Mod/Robot/Gui/TaskRobot6Axis.cpp
index decaeccaf7..5aee5c7457 100644
--- a/src/Mod/Robot/Gui/TaskRobot6Axis.cpp
+++ b/src/Mod/Robot/Gui/TaskRobot6Axis.cpp
@@ -20,30 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <qpalette.h>
+# include <QString>
 #endif
 
-#include <Base/Console.h>
-#include <Base/UnitsApi.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Placement.h>
+#include <Gui/Selection.h>
 
-#include <QString>
-#include <qpalette.h>
-#include <QSlider>
 #include "ui_TaskRobot6Axis.h"
 #include "TaskRobot6Axis.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/Placement.h>
-
-
 
 using namespace RobotGui;
 using namespace Gui;
diff --git a/src/Mod/Robot/Gui/TaskRobot6Axis.h b/src/Mod/Robot/Gui/TaskRobot6Axis.h
index 348fdbe208..dfe71800a8 100644
--- a/src/Mod/Robot/Gui/TaskRobot6Axis.h
+++ b/src/Mod/Robot/Gui/TaskRobot6Axis.h
@@ -20,15 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskRobot6Axis_H
 #define GUI_TASKVIEW_TaskRobot6Axis_H
 
 #include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
-
 #include <Mod/Robot/App/RobotObject.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
 
 
 class Ui_TaskRobot6Axis;
diff --git a/src/Mod/Robot/Gui/TaskRobotControl.cpp b/src/Mod/Robot/Gui/TaskRobotControl.cpp
index 32839b7d8a..73674e8678 100644
--- a/src/Mod/Robot/Gui/TaskRobotControl.cpp
+++ b/src/Mod/Robot/Gui/TaskRobotControl.cpp
@@ -20,23 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
+#include <Gui/BitmapFactory.h>
 
-#include <QString>
-#include <QSlider>
 #include "ui_TaskRobotControl.h"
 #include "TaskRobotControl.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/Selection.h>
 
 
 using namespace RobotGui;
diff --git a/src/Mod/Robot/Gui/TaskRobotControl.h b/src/Mod/Robot/Gui/TaskRobotControl.h
index 16b6f39d67..b007054ecb 100644
--- a/src/Mod/Robot/Gui/TaskRobotControl.h
+++ b/src/Mod/Robot/Gui/TaskRobotControl.h
@@ -20,15 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskRobotControl_H
 #define GUI_TASKVIEW_TaskRobotControl_H
 
 #include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
 
 #include <Mod/Robot/App/RobotObject.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
 
 
 class Ui_TaskRobotControl;
@@ -43,8 +40,6 @@ class ViewProvider;
 
 namespace RobotGui { 
 
-
-
 class TaskRobotControl : public Gui::TaskView::TaskBox
 {
     Q_OBJECT
diff --git a/src/Mod/Robot/Gui/TaskRobotMessages.cpp b/src/Mod/Robot/Gui/TaskRobotMessages.cpp
index e807633a54..b5fdffeaaf 100644
--- a/src/Mod/Robot/Gui/TaskRobotMessages.cpp
+++ b/src/Mod/Robot/Gui/TaskRobotMessages.cpp
@@ -20,23 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
+#include <Gui/BitmapFactory.h>
 
-#include <QString>
-#include <QSlider>
 #include "ui_TaskRobotMessages.h"
 #include "TaskRobotMessages.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/Selection.h>
 
 
 using namespace RobotGui;
diff --git a/src/Mod/Robot/Gui/TaskRobotMessages.h b/src/Mod/Robot/Gui/TaskRobotMessages.h
index 19bf9f6429..c4b8d519a5 100644
--- a/src/Mod/Robot/Gui/TaskRobotMessages.h
+++ b/src/Mod/Robot/Gui/TaskRobotMessages.h
@@ -20,15 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskRobotMessages_H
 #define GUI_TASKVIEW_TaskRobotMessages_H
 
 #include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
-
 #include <Mod/Robot/App/RobotObject.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
 
 
 class Ui_TaskRobotMessages;
diff --git a/src/Mod/Robot/Gui/TaskTrajectory.cpp b/src/Mod/Robot/Gui/TaskTrajectory.cpp
index 9edcc38613..1035e27a05 100644
--- a/src/Mod/Robot/Gui/TaskTrajectory.cpp
+++ b/src/Mod/Robot/Gui/TaskTrajectory.cpp
@@ -20,21 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
+#include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Document.h>
 
 #include "ui_TaskTrajectory.h"
 #include "TaskTrajectory.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/Selection.h>
 
 
 using namespace RobotGui;
diff --git a/src/Mod/Robot/Gui/TaskTrajectory.h b/src/Mod/Robot/Gui/TaskTrajectory.h
index fad5c932fc..67ca8deb4b 100644
--- a/src/Mod/Robot/Gui/TaskTrajectory.h
+++ b/src/Mod/Robot/Gui/TaskTrajectory.h
@@ -20,21 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskTrajectory_H
 #define GUI_TASKVIEW_TaskTrajectory_H
 
-#include <Base/UnitsApi.h>
-
-
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/Selection.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/Robot/App/RobotObject.h>
-#include <Mod/Robot/App/Robot6Axis.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
-#include <Mod/Robot/App/Trajectory.h>
 #include <Mod/Robot/App/Simulation.h>
+#include <Mod/Robot/App/TrajectoryObject.h>
 
 #include "ViewProviderRobotObject.h"
 
diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp
index b920337cc6..f7b4d5562b 100644
--- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp
+++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp
@@ -20,24 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <QString>
 #endif
 
-#include <QString>
-#include <QSlider>
-#include "ui_TaskTrajectoryDressUpParameter.h"
-#include "TaskTrajectoryDressUpParameter.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/Selection.h>
 #include <Gui/Placement.h>
+#include <Gui/Selection.h>
+
+#include "TaskTrajectoryDressUpParameter.h"
+#include "ui_TaskTrajectoryDressUpParameter.h"
 
 
 using namespace RobotGui;
diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h
index ab986d7177..e208d508a6 100644
--- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h
+++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h
@@ -20,25 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TaskTrajectoryDressUpParameter_h
 #define GUI_TASKVIEW_TaskTrajectoryDressUpParameter_h
 
 #include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
-
-#include <Mod/Robot/App/Edge2TracObject.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
 #include <Mod/Robot/App/TrajectoryDressUpObject.h>
 
 
 class Ui_TaskTrajectoryDressUpParameter;
-
  
 namespace RobotGui { 
 
-
-
 class TaskTrajectoryDressUpParameter : public Gui::TaskView::TaskBox
 {
     Q_OBJECT
diff --git a/src/Mod/Robot/Gui/TaskWatcher.cpp b/src/Mod/Robot/Gui/TaskWatcher.cpp
index f1ba9536b2..b8a7e98d08 100644
--- a/src/Mod/Robot/Gui/TaskWatcher.cpp
+++ b/src/Mod/Robot/Gui/TaskWatcher.cpp
@@ -20,22 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#  include <QPixmap>
-#endif
-
-
-
 #include "TaskWatcher.h"
-#include <Gui/SelectionObject.h>
 
 
 using namespace RobotGui;
 
-
 //**************************************************************************
 //**************************************************************************
 // TaskWatcher
diff --git a/src/Mod/Robot/Gui/TaskWatcher.h b/src/Mod/Robot/Gui/TaskWatcher.h
index be6e9bf97d..27a858d528 100644
--- a/src/Mod/Robot/Gui/TaskWatcher.h
+++ b/src/Mod/Robot/Gui/TaskWatcher.h
@@ -20,17 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef ROBOTGUI_TASKWATCHER_H
 #define ROBOTGUI_TASKWATCHER_H
 
-
-
 #include <Gui/TaskView/TaskWatcher.h>
+
 #include "TaskRobot6Axis.h"
 #include "TaskRobotControl.h"
 
-#include <QObject>
 
 namespace RobotGui {
 
diff --git a/src/Mod/Robot/Gui/TrajectorySimulate.cpp b/src/Mod/Robot/Gui/TrajectorySimulate.cpp
index 20661926dc..1a13a0b144 100644
--- a/src/Mod/Robot/Gui/TrajectorySimulate.cpp
+++ b/src/Mod/Robot/Gui/TrajectorySimulate.cpp
@@ -20,25 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <QTimer>
 #endif
 
-#include <QTimer>
-#include "ui_TrajectorySimulate.h"
-#include "TrajectorySimulate.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/Selection.h>
-
 #include <Mod/Robot/App/Waypoint.h>
 
+#include "ui_TrajectorySimulate.h"
+#include "TrajectorySimulate.h"
+
 
 using namespace RobotGui;
 using namespace Gui;
@@ -83,21 +76,20 @@ TrajectorySimulate::TrajectorySimulate(Robot::RobotObject *pcRobotObject,Robot::
 
     }
 
-    QObject::connect(ui->ButtonStepStart    ,SIGNAL(clicked()),this,SLOT(start()));
-    QObject::connect(ui->ButtonStepStop     ,SIGNAL(clicked()),this,SLOT(stop()));
-    QObject::connect(ui->ButtonStepRun      ,SIGNAL(clicked()),this,SLOT(run()));
-    QObject::connect(ui->ButtonStepBack     ,SIGNAL(clicked()),this,SLOT(back()));
-    QObject::connect(ui->ButtonStepForward  ,SIGNAL(clicked()),this,SLOT(forward()));
-    QObject::connect(ui->ButtonStepEnd      ,SIGNAL(clicked()),this,SLOT(end()));
-
+    QObject::connect(ui->ButtonStepStart, SIGNAL(clicked()), this, SLOT(start()));
+    QObject::connect(ui->ButtonStepStop, SIGNAL(clicked()), this, SLOT(stop()));
+    QObject::connect(ui->ButtonStepRun, SIGNAL(clicked()), this, SLOT(run()));
+    QObject::connect(ui->ButtonStepBack, SIGNAL(clicked()), this, SLOT(back()));
+    QObject::connect(ui->ButtonStepForward, SIGNAL(clicked()), this, SLOT(forward()));
+    QObject::connect(ui->ButtonStepEnd, SIGNAL(clicked()), this, SLOT(end()));
 
     // set up timer
-    timer = new QTimer( this );
+    timer = new QTimer(this);
     timer->setInterval(100);
-    QObject::connect(timer      ,SIGNAL(timeout ()),this,SLOT(timerDone()));
-
-    QObject::connect(ui->timeSpinBox       ,SIGNAL(valueChanged(double)), this, SLOT(valueChanged(double)) );
-    QObject::connect(ui->timeSlider        ,SIGNAL(valueChanged(int)   ), this, SLOT(valueChanged(int)) );
+    QObject::connect(timer, SIGNAL(timeout()), this, SLOT(timerDone()));
+    QObject::connect(ui->timeSpinBox, SIGNAL(valueChanged(double)), this,
+                     SLOT(valueChanged(double)));
+    QObject::connect(ui->timeSlider, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int)));
 
     // get the view provider
     ViewProv = static_cast<ViewProviderRobotObject*>(Gui::Application::Instance->activeDocument()->getViewProvider(pcRobotObject) );
diff --git a/src/Mod/Robot/Gui/TrajectorySimulate.h b/src/Mod/Robot/Gui/TrajectorySimulate.h
index 19b1d813ce..8317560113 100644
--- a/src/Mod/Robot/Gui/TrajectorySimulate.h
+++ b/src/Mod/Robot/Gui/TrajectorySimulate.h
@@ -20,19 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TASKVIEW_TrajectorySimulate_H
 #define GUI_TASKVIEW_TrajectorySimulate_H
 
-
-#include <QDialog>
 #include <memory>
+#include <QDialog>
 
 #include <Mod/Robot/App/RobotObject.h>
-#include <Mod/Robot/App/Robot6Axis.h>
-#include <Mod/Robot/App/TrajectoryObject.h>
-#include <Mod/Robot/App/Trajectory.h>
 #include <Mod/Robot/App/Simulation.h>
+#include <Mod/Robot/App/TrajectoryObject.h>
 
 #include "ViewProviderRobotObject.h"
 
diff --git a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp
index a07ff7b290..359b7b2b58 100644
--- a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include "ViewProviderEdge2TracObject.h"
 #include <Gui/Control.h>
 #include <Mod/Robot/Gui/TaskDlgEdge2Trac.h>
 
+#include "ViewProviderEdge2TracObject.h"
+
+
 using namespace Gui;
 using namespace RobotGui;
 
diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
index 45ae12a071..5db94b8567 100644
--- a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
@@ -20,36 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <sstream>
+# include <QFile>
+
 # include <Inventor/SoDB.h>
 # include <Inventor/SoInput.h>
 # include <Inventor/SbVec3f.h>
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoTransform.h>
-# include <Inventor/nodes/SoSphere.h>
-# include <Inventor/nodes/SoRotation.h>
 # include <Inventor/actions/SoSearchAction.h>
 # include <Inventor/draggers/SoJackDragger.h>
-# include <Inventor/draggers/SoTrackballDragger.h>
+# include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/VRMLnodes/SoVRMLTransform.h>
-# include <QFile>
 #endif
 
-#include "ViewProviderRobotObject.h"
-
-#include <Mod/Robot/App/RobotObject.h>
-#include <Mod/Part/App/PartFeature.h>
-#include <Mod/Part/Gui/ViewProvider.h>
 #include <App/Document.h>
 #include <App/VRMLObject.h>
 #include <Gui/Application.h>
-#include <Base/FileInfo.h>
-#include <Base/Stream.h>
-#include <Base/Console.h>
-#include <sstream>
+#include <Mod/Robot/App/RobotObject.h>
+#include <Mod/Part/Gui/ViewProvider.h>
+
+#include "ViewProviderRobotObject.h"
+
+
 using namespace Gui;
 using namespace RobotGui;
 
diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.h b/src/Mod/Robot/Gui/ViewProviderRobotObject.h
index 1c27b1f15c..d4e4366c13 100644
--- a/src/Mod/Robot/Gui/ViewProviderRobotObject.h
+++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.h
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef ROBOT_VIEWPROVIDERROBOTOBJECT_H
 #define ROBOT_VIEWPROVIDERROBOTOBJECT_H
 
-#include <Inventor/VRMLnodes/SoVRMLTransform.h>
-#include <Gui/ViewProviderGeometryObject.h>
-#include <Gui/SoFCSelection.h>
 #include <Base/Placement.h>
+#include <Gui/SoFCSelection.h>
+#include <Gui/ViewProviderGeometryObject.h>
+#include <Inventor/VRMLnodes/SoVRMLTransform.h>
+
 
 class SoDragger;
 class SoJackDragger;
diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp
index ade7eb6171..b7843f62e1 100644
--- a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp
@@ -20,43 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <Inventor/SoDB.h>
-# include <Inventor/SoInput.h>
-# include <Inventor/SbVec3f.h>
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoTransform.h>
-# include <Inventor/nodes/SoSphere.h>
-# include <Inventor/nodes/SoRotation.h>
-# include <Inventor/actions/SoSearchAction.h>
-# include <Inventor/draggers/SoJackDragger.h>
-# include <Inventor/VRMLnodes/SoVRMLTransform.h>
+# include <sstream>
+# include <QAction>
+# include <QMenu>
+
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/nodes/SoFaceSet.h>
 # include <Inventor/nodes/SoLineSet.h>
 # include <Inventor/nodes/SoMarkerSet.h>
-# include <Inventor/nodes/SoShapeHints.h>
-# include <QFile>
-# include <QAction>
-# include <QMenu>
+# include <Inventor/nodes/SoSeparator.h>
 #endif
 
+#include <App/Application.h>
+#include <App/Document.h>
+#include <Gui/Inventor/MarkerBitmaps.h>
+#include <Mod/Robot/App/TrajectoryObject.h>
+
 #include "ViewProviderTrajectory.h"
 
-#include <Mod/Robot/App/TrajectoryObject.h>
-#include <Mod/Robot/App/Trajectory.h>
-#include <App/Document.h>
-#include <Base/FileInfo.h>
-#include <Base/Stream.h>
-#include <Base/Console.h>
-#include <App/Application.h>
-#include <Gui/Inventor/MarkerBitmaps.h>
-#include <sstream>
+
 using namespace Gui;
 using namespace RobotGui;
 using namespace Robot;
diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.h b/src/Mod/Robot/Gui/ViewProviderTrajectory.h
index 7344a24745..f40d974546 100644
--- a/src/Mod/Robot/Gui/ViewProviderTrajectory.h
+++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.h
@@ -20,18 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef ROBOT_ViewProviderTrajectory_H
 #define ROBOT_ViewProviderTrajectory_H
 
-#include <Inventor/VRMLnodes/SoVRMLTransform.h>
-#include <Gui/ViewProviderGeometryObject.h>
 #include <Gui/SoFCSelection.h>
+#include <Gui/ViewProviderGeometryObject.h>
+
 
-class SoDragger;
-class SoJackDragger;
 class SoCoordinate3;
+class SoDragger;
 class SoDrawStyle;
+class SoJackDragger;
 class SoLineSet;
 
 namespace RobotGui
diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp
index 0b426e093e..7e6be66a0d 100644
--- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp
@@ -20,17 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include "ViewProviderTrajectoryCompound.h"
 #include <Gui/Control.h>
 #include <Mod/Robot/Gui/TaskDlgTrajectoryCompound.h>
 #include <Mod/Robot/App/TrajectoryCompound.h>
 
+#include "ViewProviderTrajectoryCompound.h"
+
+
 using namespace Gui;
 using namespace RobotGui;
 
diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp
index 6397e31635..9d9f81000d 100644
--- a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include "ViewProviderTrajectoryDressUp.h"
 #include <Gui/Control.h>
 #include <Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h>
 
+#include "ViewProviderTrajectoryDressUp.h"
+
+
 using namespace Gui;
 using namespace RobotGui;
 
diff --git a/src/Mod/Robot/Gui/Workbench.cpp b/src/Mod/Robot/Gui/Workbench.cpp
index e5c30401b6..042f5efe65 100644
--- a/src/Mod/Robot/Gui/Workbench.cpp
+++ b/src/Mod/Robot/Gui/Workbench.cpp
@@ -20,26 +20,24 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <qobject.h>
 # include <QDir>
+# include <qobject.h>
 # include <QFileInfo>
 # include <QMessageBox>
 #endif
 
-#include "Workbench.h"
 #include <App/Application.h>
-#include <Gui/ToolBarManager.h>
-#include <Gui/MenuManager.h>
-#include <Gui/MainWindow.h>
 #include <Gui/Control.h>
+#include <Gui/MainWindow.h>
+#include <Gui/MenuManager.h>
+#include <Gui/ToolBarManager.h>
 #include <Gui/WaitCursor.h>
 #include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskWatcher.h>
 
+#include "Workbench.h"
 #include "TaskWatcher.h"
 
 
diff --git a/src/Mod/Robot/Gui/Workbench.h b/src/Mod/Robot/Gui/Workbench.h
index 5b4f1725e8..24c224a6be 100644
--- a/src/Mod/Robot/Gui/Workbench.h
+++ b/src/Mod/Robot/Gui/Workbench.h
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef IMAGE_WORKBENCH_H
 #define IMAGE_WORKBENCH_H
 
 #include <Gui/Workbench.h>
 #include <Gui/TaskView/TaskWatcher.h>
 
+
 namespace RobotGui {
 
 /**
diff --git a/src/Mod/Start/App/AppStart.cpp b/src/Mod/Start/App/AppStart.cpp
index 97e1d95d72..8ed3eb8181 100644
--- a/src/Mod/Start/App/AppStart.cpp
+++ b/src/Mod/Start/App/AppStart.cpp
@@ -23,8 +23,8 @@
 #include "PreCompiled.h"
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 
 
 namespace Start {
diff --git a/src/Mod/Start/Gui/DlgStartPreferencesImp.h b/src/Mod/Start/Gui/DlgStartPreferencesImp.h
index f65a5283c9..391e5c3bd9 100644
--- a/src/Mod/Start/Gui/DlgStartPreferencesImp.h
+++ b/src/Mod/Start/Gui/DlgStartPreferencesImp.h
@@ -20,12 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef STARTGUI_DLGSTARTPREFERENCESIMP_H
 #define STARTGUI_DLGSTARTPREFERENCESIMP_H
 
-#include <Gui/PropertyPage.h>
 #include <memory>
+#include <Gui/PropertyPage.h>
+
 
 class Ui_DlgStartPreferences;
 namespace StartGui {
diff --git a/src/Mod/Start/Gui/PreCompiled.h b/src/Mod/Start/Gui/PreCompiled.h
index c529adc283..41730b5aa3 100644
--- a/src/Mod/Start/Gui/PreCompiled.h
+++ b/src/Mod/Start/Gui/PreCompiled.h
@@ -26,21 +26,6 @@
 #include <FCConfig.h>
 
 #ifdef _PreComp_
-// standard
-#include <iostream>
-#include <cassert>
-#include <cmath>
-
-// STL
-#include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
-#include <algorithm>
-#include <stack>
-#include <queue>
-#include <bitset>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
diff --git a/src/Mod/Start/Gui/Workbench.cpp b/src/Mod/Start/Gui/Workbench.cpp
index b8da50c321..1d3184b028 100644
--- a/src/Mod/Start/Gui/Workbench.cpp
+++ b/src/Mod/Start/Gui/Workbench.cpp
@@ -26,19 +26,17 @@
 # include <QCoreApplication>
 #endif
 
-#include "Workbench.h"
-
 #include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/Interpreter.h>
 #include <Base/Tools.h>
-
-#include <Gui/ToolBarManager.h>
-#include <Gui/DockWindowManager.h>
-#include <Gui/Application.h>
 #include <Gui/Command.h>
+#include <Gui/DockWindowManager.h>
 #include <Gui/MainWindow.h>
 #include <Gui/MDIView.h>
+#include <Gui/ToolBarManager.h>
+
+#include "Workbench.h"
 
 
 using namespace StartGui;
diff --git a/src/Mod/TechDraw/Gui/DlgPageChooser.cpp b/src/Mod/TechDraw/Gui/DlgPageChooser.cpp
index ae25220f02..e44325752d 100644
--- a/src/Mod/TechDraw/Gui/DlgPageChooser.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPageChooser.cpp
@@ -26,7 +26,7 @@
 # include <QList>
 #endif
 
-#include <Base/Console.h>
+#include <Base/Console.h> // for FC_LOG_LEVEL_INIT
 #include <Base/Tools.h>
 
 #include "DlgPageChooser.h"
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp
index 622df06b9a..cfb111c45f 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp
@@ -23,8 +23,9 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
-#include <vector>
+#ifndef _PreComp_
+# include <vector>
+#endif
 
 #include <Mod/TechDraw/App/LineGroup.h>
 
diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.h b/src/Mod/TechDraw/Gui/DlgTemplateField.h
index b5ba4e3191..0fe641b7d0 100644
--- a/src/Mod/TechDraw/Gui/DlgTemplateField.h
+++ b/src/Mod/TechDraw/Gui/DlgTemplateField.h
@@ -20,15 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_DLGTEMPLATEFIELD_H
 #define DRAWINGGUI_DLGTEMPLATEFIELD_H
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
+#include <memory>
 #include <QDialog>
 #include <QString>
-#include <memory>
+
 
 namespace TechDrawGui {
 
diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h
index d88f6de2bf..4836a34edc 100644
--- a/src/Mod/TechDraw/Gui/PreCompiled.h
+++ b/src/Mod/TechDraw/Gui/PreCompiled.h
@@ -43,13 +43,7 @@
 
 // STL
 #include <algorithm>
-#include <bitset>
-#include <list>
-#include <map>
-#include <queue>
 #include <regex>
-#include <set>
-#include <stack>
 #include <string>
 #include <vector>
 
@@ -76,11 +70,7 @@
 #include <gp_Dir.hxx>
 
 // Open Inventor
-#include <Inventor/misc/SoChildList.h>
-#include <Inventor/nodes/SoDirectionalLight.h>
-#include <Inventor/nodes/SoOrthographicCamera.h>
-#include <Inventor/nodes/SoPerspectiveCamera.h>
-#include <Inventor/nodes/SoSeparator.h>
+#include <Inventor/SbVec3f.h>
 
 #endif //_PreComp_
 
diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
index 4fe60103d2..9d54ff4619 100644
--- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
@@ -23,45 +23,29 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <QApplication>
-#include <QPushButton>
-#include <QStatusBar>
-#include <QMessageBox>
-#include <QTemporaryFile>
+# include <regex>
+# include <QMessageBox>
+# include <QPushButton>
 #endif // #ifndef _PreComp_
 
-#include <regex>
-
+#include <App/Document.h>
 #include <Base/Console.h>
 #include <Base/Tools.h>
-#include <Base/UnitsApi.h>
-
-#include <App/Document.h>
-
-#include <Base/FileInfo.h>
-
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
-#include <Gui/Control.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
-#include <Gui/Selection.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-
 #include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/DrawView.h>
-#include <Mod/TechDraw/App/DrawViewSymbol.h>
 #include <Mod/TechDraw/App/DrawViewImage.h>
 
-#include <Mod/TechDraw/Gui/ui_TaskActiveView.h>
-
+#include "ui_TaskActiveView.h"
+#include "TaskActiveView.h"
 #include "Grabber3d.h"
 #include "ViewProviderImage.h"
-#include "TaskActiveView.h"
+
 
 using namespace Gui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.h b/src/Mod/TechDraw/Gui/TaskActiveView.h
index 266064812e..553f85c1e6 100644
--- a/src/Mod/TechDraw/Gui/TaskActiveView.h
+++ b/src/Mod/TechDraw/Gui/TaskActiveView.h
@@ -23,10 +23,9 @@
 #ifndef TECHDRAWGUI_TASKACTIVEVIEW_H
 #define TECHDRAWGUI_TASKACTIVEVIEW_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 
 class QPushButton;
diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
index 13013862e4..c93fc2110a 100644
--- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
+++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
@@ -22,37 +22,28 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-#include <cmath>
+# include <cmath>
+# include <QMessageBox>
 #endif // #ifndef _PreComp_
 
-#include <QMessageBox>
-
 #include <Base/Console.h>
-
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
-#include <Gui/Control.h>
 #include <Gui/Document.h>
 #include <Gui/WaitCursor.h>
 
-#include <Mod/Part/App/PartFeature.h>
-
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawProjGroupItem.h>
 #include <Mod/TechDraw/App/DrawProjGroup.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/DrawView.h>
-#include <Mod/TechDraw/App/DrawViewPart.h>
 
+#include "TaskProjGroup.h"
+#include "ui_TaskProjGroup.h"
 #include "MDIViewPage.h"
 #include "ViewProviderPage.h"
 #include "ViewProviderProjGroup.h"
 
-#include "TaskProjGroup.h"
-#include <Mod/TechDraw/Gui/ui_TaskProjGroup.h>
 
 using namespace Gui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h
index fced399e71..8fdf6e01b4 100644
--- a/src/Mod/TechDraw/Gui/TaskProjGroup.h
+++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h
@@ -24,13 +24,13 @@
 #ifndef GUI_TASKVIEW_TASKVIEWGROUP_H
 #define GUI_TASKVIEW_TASKVIEWGROUP_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <QString>
 
 #include <Base/Vector3D.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 
 namespace TechDraw {
 class DrawProjGroup;
diff --git a/src/Mod/TechDraw/Gui/TaskProjection.h b/src/Mod/TechDraw/Gui/TaskProjection.h
index 72fe56eb0d..19c7288575 100644
--- a/src/Mod/TechDraw/Gui/TaskProjection.h
+++ b/src/Mod/TechDraw/Gui/TaskProjection.h
@@ -25,8 +25,8 @@
 
 #ifndef TECHDRAWGUI_TASKDIALOG
 #define TECHDRAWGUI_TASKDIALOG
-
-#include <Mod/TechDraw/TechDrawGlobal.h>
+
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <QWidget>
 
diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
index 33b5e0ce9e..f4929673ac 100644
--- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
@@ -21,7 +21,6 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <cmath>
 # include <QDialog>
@@ -33,30 +32,23 @@
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
-#include <Gui/Control.h>
 #include <Gui/Document.h>
-#include <Gui/MainWindow.h>
-#include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/DrawView.h>
 #include <Mod/TechDraw/App/DrawLeaderLine.h>
+#include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawRichAnno.h>
 #include <Mod/TechDraw/App/LineGroup.h>
 
 #include "ui_TaskRichAnno.h"
 #include "TaskRichAnno.h"
+#include "mrichtextedit.h"
 #include "PreferencesGui.h"
-#include "QGSPage.h"
 #include "QGIView.h"
+#include "QGMText.h"
+#include "QGSPage.h"
+#include "Rez.h"
 #include "ViewProviderPage.h"
 #include "ViewProviderRichAnno.h"
-#include "QGMText.h"
-#include "QGIRichAnno.h"
-#include "Rez.h"
-#include "mrichtextedit.h"
 
 
 using namespace Gui;
diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.h b/src/Mod/TechDraw/Gui/TaskRichAnno.h
index 23c5e31317..45fa430e4b 100644
--- a/src/Mod/TechDraw/Gui/TaskRichAnno.h
+++ b/src/Mod/TechDraw/Gui/TaskRichAnno.h
@@ -23,11 +23,10 @@
 #ifndef TECHDRAWGUI_TASKRICHANNO_H
 #define TECHDRAWGUI_TASKRICHANNO_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <Base/Vector3D.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 
 class MRichTextEdit;
diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
index cfb168fa95..ad9253eef6 100644
--- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
@@ -21,46 +21,32 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-#include <cmath>
-#include <QApplication>
-#include <QStatusBar>
-#include <QGraphicsScene>
-#include <QMessageBox>
+# include <cmath>
+# include <QMessageBox>
 #endif // #ifndef _PreComp_
 
+#include <App/Document.h>
+#include <App/DocumentObject.h>
 #include <Base/Console.h>
 #include <Base/Tools.h>
-#include <Base/UnitsApi.h>
-
-#include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
-#include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
-
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
-
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawViewPart.h>
 #include <Mod/TechDraw/App/DrawViewSection.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-
-//#include "ViewProviderPage.h"
-//#include "ViewProviderViewPart.h"
-
-#include <Mod/TechDraw/Gui/ui_TaskSectionView.h>
 #include "Widgets/CompassWidget.h"
 #include "Widgets/VectorEditWidget.h"
+
+#include "ui_TaskSectionView.h"
 #include "TaskSectionView.h"
 
+
 using namespace Gui;
 using namespace TechDraw;
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.h b/src/Mod/TechDraw/Gui/TaskSectionView.h
index bf7e5e0b85..c4a8bb6ae1 100644
--- a/src/Mod/TechDraw/Gui/TaskSectionView.h
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.h
@@ -23,10 +23,9 @@
 #ifndef GUI_TASKVIEW_TASKSECTIONVIEW_H
 #define GUI_TASKVIEW_TASKSECTIONVIEW_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 
 class Ui_TaskSectionView;
diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
index 6a354d84d2..ded51453f6 100644
--- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
@@ -22,48 +22,11 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#include <cmath>
-#include <BRepBndLib.hxx>
-#include <Bnd_Box.hxx>
-#include <QButtonGroup>
-#include <QStatusBar>
-#include <QGraphicsScene>
-#endif // #ifndef _PreComp_
-
-#include <BRepBuilderAPI_MakeEdge.hxx>
-
-#include <Base/Console.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
-
-#include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/Command.h>
-#include <Gui/Control.h>
-#include <Gui/Document.h>
-#include <Gui/MainWindow.h>
-#include <Gui/Selection.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-
-#include <Mod/TechDraw/App/Cosmetic.h>
-#include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/DrawView.h>
-#include <Mod/TechDraw/App/DrawViewPart.h>
-#include <Mod/TechDraw/App/Geometry.h>
 
 #include "ui_TaskSelectLineAttributes.h"
 #include "TaskSelectLineAttributes.h"
-#include "MDIViewPage.h"
-#include "PreferencesGui.h"
-#include "QGVPage.h"
-#include "QGIPrimPath.h"
-#include "QGIView.h"
-#include "Rez.h"
-#include "ViewProviderPage.h"
-#include "ViewProviderViewPart.h"
+
 
 using namespace Gui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
index 9bbb56039c..4416120532 100644
--- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
+++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
@@ -23,10 +23,9 @@
 #ifndef TECHDRAWGUI_TASKSELECTLINEATTRIBUTES_H
 #define TECHDRAWGUI_TASKSELECTLINEATTRIBUTES_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 
 class dimAttributes {
diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
index 95f1b525f3..d82c936b8c 100644
--- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
@@ -22,9 +22,9 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QLineEdit>
-#include <QGraphicsProxyWidget>
-#include <QComboBox>
+# include <QComboBox>
+# include <QGraphicsProxyWidget>
+# include <QLineEdit>
 #endif
 
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h
index 3985cddfe3..eac4632bc3 100644
--- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h
+++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.h
@@ -23,10 +23,10 @@
 #ifndef TECHDRAWGUI_TASKSURFACEFINISHSYMBOLS_H
 #define TECHDRAWGUI_TASKSURFACEFINISHSYMBOLS_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 
 class QComboBox;
 class QLineEdit;
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
index 81cc652a90..6b957cdebe 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
@@ -21,51 +21,28 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-#include <cmath>
-#include <BRepBndLib.hxx>
-#include <Bnd_Box.hxx>
-#include <QApplication>
-#include <QGraphicsScene>
-#include <QPushButton>
-#include <QStatusBar>
+# include <cmath>
+# include <QPushButton>
 #endif // #ifndef _PreComp_
 
-
+#include <App/Document.h>
 #include <Base/Console.h>
 #include <Base/Tools.h>
-#include <Base/UnitsApi.h>
-
-#include <App/Document.h>
-
-#include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
-#include <Gui/Control.h>
 #include <Gui/Document.h>
-#include <Gui/MainWindow.h>
-#include <Gui/Selection.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
 
 #include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/DrawView.h>
-#include <Mod/TechDraw/App/DrawViewPart.h>
 #include <Mod/TechDraw/App/DrawLeaderLine.h>
-#include <Mod/TechDraw/App/DrawWeldSymbol.h>
-#include <Mod/TechDraw/App/DrawTile.h>
 #include <Mod/TechDraw/App/DrawTileWeld.h>
-#include <Mod/TechDraw/App/Geometry.h>
-#include <Mod/TechDraw/App/Cosmetic.h>
-#include <Mod/TechDraw/Gui/ui_TaskWeldingSymbol.h>
-
-#include "PreferencesGui.h"
-#include "SymbolChooser.h"
+#include <Mod/TechDraw/App/DrawWeldSymbol.h>
 
 #include "TaskWeldingSymbol.h"
 #include "ui_TaskWeldingSymbol.h"
+#include "PreferencesGui.h"
+#include "SymbolChooser.h"
+
 
 using namespace Gui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h
index 0f36f293d1..5d8090e097 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h
@@ -23,10 +23,10 @@
 #ifndef TECHDRAWGUI_TASKWELDINGSYMBOL_H
 #define TECHDRAWGUI_TASKWELDINGSYMBOL_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 
 class QPushButton;
 class Ui_TaskWeldingSymbol;
diff --git a/src/Mod/Web/App/PreCompiled.h b/src/Mod/Web/App/PreCompiled.h
index 61806b6b0d..99df2613e2 100644
--- a/src/Mod/Web/App/PreCompiled.h
+++ b/src/Mod/Web/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef APP_PRECOMPILED_H
 #define APP_PRECOMPILED_H
 
@@ -29,24 +28,12 @@
 #ifdef _PreComp_
 
 // standard
-#include <cstdio>
-#include <cassert>
 #include <climits>
-#include <iostream>
 #include <stdexcept>
 
 // STL
-#include <algorithm>
-#include <iostream>
-#include <list>
-#include <map>
 #include <memory>
-#include <queue>
-#include <set>
 #include <sstream>
-#include <stack>
-#include <string>
-#include <vector>
 
 // Qt
 #include <QCoreApplication>
diff --git a/src/Mod/Web/Gui/AppWebGui.cpp b/src/Mod/Web/Gui/AppWebGui.cpp
index f872b334a2..4f09f2150b 100644
--- a/src/Mod/Web/Gui/AppWebGui.cpp
+++ b/src/Mod/Web/Gui/AppWebGui.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <string>
 # include <QIcon>
 # include <QUrl>
 #endif
diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp
index 1f8d1860b9..1bec2eb39b 100644
--- a/src/Mod/Web/Gui/BrowserView.cpp
+++ b/src/Mod/Web/Gui/BrowserView.cpp
@@ -21,8 +21,9 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <vector>
+
 # include <QApplication>
 # include <QDesktopServices>
 # include <QFileInfo>
@@ -34,16 +35,15 @@
 # include <QNetworkRequest>
 # include <QRegularExpression>
 # include <QRegularExpressionMatch>
-# include <QScreen>
 # include <QSignalMapper>
 # include <QStatusBar>
 #endif
 
 #if defined(QTWEBENGINE)
 # if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-# include <QWebEngineContextMenuData>
+#  include <QWebEngineContextMenuData>
 # else
-# include <QWebEngineContextMenuRequest>
+#  include <QWebEngineContextMenuRequest>
 # endif
 # include <QWebEnginePage>
 # include <QWebEngineProfile>
diff --git a/src/Mod/Web/Gui/BrowserView.h b/src/Mod/Web/Gui/BrowserView.h
index 5eab164722..d5e6990f36 100644
--- a/src/Mod/Web/Gui/BrowserView.h
+++ b/src/Mod/Web/Gui/BrowserView.h
@@ -23,26 +23,24 @@
 #ifndef WEBGUI_BROWSERVIEW_H
 #define WEBGUI_BROWSERVIEW_H
 
+#include <QLineEdit>
+#include <QPointer>
+#if defined(QTWEBENGINE)
+# include <QWebEngineView>
+namespace WebGui {
+ class WebEngineUrlRequestInterceptor;
+}
+#elif defined(QTWEBKIT)
+# include <QWebView>
+#endif
 
 #include <Gui/MDIView.h>
 #include <Gui/Window.h>
 #include <Mod/Web/WebGlobal.h>
-#include <QLineEdit>
-#include <QPointer>
 
-#if defined(QTWEBENGINE)
-#include <QWebEngineView>
-
-namespace WebGui {
-class WebEngineUrlRequestInterceptor;
-}
-#elif defined(QTWEBKIT)
-#include <QWebView>
-#endif
-
-class QUrl;
-class QNetworkRequest;
 class QNetworkReply;
+class QNetworkRequest;
+class QUrl;
 
 namespace WebGui {
 class UrlWidget;
diff --git a/src/Mod/Web/Gui/CookieJar.cpp b/src/Mod/Web/Gui/CookieJar.cpp
index 3d8a5f6d69..4fc4677c26 100644
--- a/src/Mod/Web/Gui/CookieJar.cpp
+++ b/src/Mod/Web/Gui/CookieJar.cpp
@@ -21,10 +21,9 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-#include <QTextStream>
-#include <QNetworkCookie>
+# include <QNetworkCookie>
+# include <QTextStream>
 #endif
 
 #include <App/Application.h>
diff --git a/src/Mod/Web/Gui/PreCompiled.h b/src/Mod/Web/Gui/PreCompiled.h
index ca89614c13..3b8c9bffea 100644
--- a/src/Mod/Web/Gui/PreCompiled.h
+++ b/src/Mod/Web/Gui/PreCompiled.h
@@ -28,21 +28,9 @@
 
 #ifdef _PreComp_
 
-// standard
-#include <iostream>
-#include <cassert>
-#include <cmath>
-
 // STL
-#include <vector>
-#include <map>
 #include <string>
-#include <list>
-#include <set>
-#include <algorithm>
-#include <stack>
-#include <queue>
-#include <bitset>
+#include <vector>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
diff --git a/src/Mod/Web/Gui/Workbench.cpp b/src/Mod/Web/Gui/Workbench.cpp
index 17f303a701..9012f34152 100644
--- a/src/Mod/Web/Gui/Workbench.cpp
+++ b/src/Mod/Web/Gui/Workbench.cpp
@@ -22,14 +22,13 @@
 
 #include "PreCompiled.h"
 
-#include "Workbench.h"
-
 #include <Gui/Application.h>
 #include <Gui/Command.h>
-#include <Gui/MenuManager.h>
 #include <Gui/Selection.h>
 #include <Gui/ToolBarManager.h>
 
+#include "Workbench.h"
+
 
 using namespace WebGui;