diff --git a/src/Mod/Path/Gui/AppPathGui.cpp b/src/Mod/Path/Gui/AppPathGui.cpp
index e73817a263..fdf973bffa 100644
--- a/src/Mod/Path/Gui/AppPathGui.cpp
+++ b/src/Mod/Path/Gui/AppPathGui.cpp
@@ -28,11 +28,12 @@
 #include <Gui/Application.h>
 #include <Gui/WidgetFactory.h>
 #include <Gui/Language/Translator.h>
-#include "ViewProviderPath.h"
+
 #include "DlgSettingsPathColor.h"
+#include "ViewProviderArea.h"
+#include "ViewProviderPath.h"
 #include "ViewProviderPathCompound.h"
 #include "ViewProviderPathShape.h"
-#include "ViewProviderArea.h"
 
 
 // use a different name to CreateCommand()
diff --git a/src/Mod/Path/Gui/AppPathGuiPy.cpp b/src/Mod/Path/Gui/AppPathGuiPy.cpp
index 8077b8dd7a..5b336d208d 100644
--- a/src/Mod/Path/Gui/AppPathGuiPy.cpp
+++ b/src/Mod/Path/Gui/AppPathGuiPy.cpp
@@ -21,26 +21,21 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
 
-#include <QDir>
-#include <QFileInfo>
-
-#include <Base/Console.h>
-#include <Base/VectorPy.h>
-#include <Base/FileInfo.h>
-#include <Base/Interpreter.h>
+#ifndef _PreComp_
+# include <QDir>
+# include <QFileInfo>
+#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectPy.h>
 
+#include <Base/FileInfo.h>
+#include <Base/Interpreter.h>
 #include <Gui/Command.h>
 #include <Gui/WaitCursor.h>
 
-#include "ViewProviderPath.h"
 #include "DlgProcessorChooser.h"
 #include "ui_DlgProcessorChooser.h"
 
diff --git a/src/Mod/Path/Gui/Command.cpp b/src/Mod/Path/Gui/Command.cpp
index 3b5aaa8fef..0d817c5c74 100644
--- a/src/Mod/Path/Gui/Command.cpp
+++ b/src/Mod/Path/Gui/Command.cpp
@@ -20,33 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <TopExp_Explorer.hxx>
 #endif
 
 #include <Base/Console.h>
-#include <App/Application.h>
 #include <Gui/Application.h>
-#include <Gui/MainWindow.h>
 #include <Gui/Command.h>
-#include <Gui/Selection.h>
-#include <Gui/SelectionFilter.h>
-#include <Gui/SelectionObject.h>
 #include <Gui/Document.h>
-#include <Gui/Control.h>
-
-#include <Mod/Path/App/FeaturePath.h>
-#include <Mod/Path/App/FeaturePathCompound.h>
-#include <Mod/Path/App/FeaturePathShape.h>
-#include <Mod/Part/App/PartFeature.h>
+#include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Mod/Path/App/FeatureArea.h>
+#include <Mod/Path/App/FeaturePathShape.h>
 
 
 // Path Area  #####################################################################################################
 
-
 DEF_STD_CMD_A(CmdPathArea)
 
 CmdPathArea::CmdPathArea()
diff --git a/src/Mod/Path/Gui/DlgProcessorChooser.cpp b/src/Mod/Path/Gui/DlgProcessorChooser.cpp
index 71a3080a4d..273af7465e 100644
--- a/src/Mod/Path/Gui/DlgProcessorChooser.cpp
+++ b/src/Mod/Path/Gui/DlgProcessorChooser.cpp
@@ -23,21 +23,15 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <QPixmap>
 # include <QDialog>
-# include <QListIterator>
 #endif
 
-#include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
 
-#include <App/Document.h>
-#include <Base/Tools.h>
-
 #include "DlgProcessorChooser.h"
 #include "ui_DlgProcessorChooser.h"
 
+
 using namespace PathGui;
 
 /* TRANSLATOR PathGui::DlgProcessorChooser */
diff --git a/src/Mod/Path/Gui/DlgProcessorChooser.h b/src/Mod/Path/Gui/DlgProcessorChooser.h
index dd07b69db9..2cb7ae3021 100644
--- a/src/Mod/Path/Gui/DlgProcessorChooser.h
+++ b/src/Mod/Path/Gui/DlgProcessorChooser.h
@@ -24,8 +24,7 @@
 #define PATH_DlgProcessorChooser_H
 
 #include <QDialog>
-#include <QString>
-#include <App/DocumentObject.h>
+
 
 class Ui_DlgProcessorChooser;
 
diff --git a/src/Mod/Path/Gui/DlgSettingsPathColor.cpp b/src/Mod/Path/Gui/DlgSettingsPathColor.cpp
index d2db05acb2..ddf1fdd6bb 100644
--- a/src/Mod/Path/Gui/DlgSettingsPathColor.cpp
+++ b/src/Mod/Path/Gui/DlgSettingsPathColor.cpp
@@ -22,13 +22,9 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "DlgSettingsPathColor.h"
 #include "ui_DlgSettingsPathColor.h"
-#include <Gui/PrefWidgets.h>
-#include <Base/Console.h>
+
 
 using namespace PathGui;
 
diff --git a/src/Mod/Path/Gui/PreCompiled.h b/src/Mod/Path/Gui/PreCompiled.h
index 3a038a5f12..7a7399fb4b 100644
--- a/src/Mod/Path/Gui/PreCompiled.h
+++ b/src/Mod/Path/Gui/PreCompiled.h
@@ -46,6 +46,9 @@
 
 #ifdef _PreComp_
 
+// boost
+#include <boost/algorithm/string/replace.hpp>
+
 // standard
 #include <iostream>
 #include <cassert>
diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp b/src/Mod/Path/Gui/TaskDlgPathCompound.cpp
index af741ba7f7..a5ff799522 100644
--- a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp
+++ b/src/Mod/Path/Gui/TaskDlgPathCompound.cpp
@@ -20,25 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <QRegularExpression>
 #endif
 
+#include <App/Document.h>
+#include <App/DocumentObject.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
+
 #include "TaskDlgPathCompound.h"
 #include "ui_TaskDlgPathCompound.h"
 
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
-#include <Gui/TaskView/TaskSelectLinkProperty.h>
-#include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/Command.h>
 
 using namespace PathGui;
 using namespace Gui;
@@ -140,13 +135,13 @@ bool TaskDlgPathCompound::accept()
         paths.push_back(pcPath);
     }
     pcCompound->Group.setValues(paths);
-    Gui::Command::doCommand(Gui::Command::Gui,"Gui.activeDocument().resetEdit()");
+    Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()");
     return true;
 }
 
 bool TaskDlgPathCompound::reject()
 {
-    Gui::Command::doCommand(Gui::Command::Gui,"Gui.activeDocument().resetEdit()");
+    Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()");
     return true;
 }
 
diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.h b/src/Mod/Path/Gui/TaskDlgPathCompound.h
index bd736c3c96..0473b112ae 100644
--- a/src/Mod/Path/Gui/TaskDlgPathCompound.h
+++ b/src/Mod/Path/Gui/TaskDlgPathCompound.h
@@ -20,17 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PATHGUI_TaskDlgPathCompound_H
 #define PATHGUI_TaskDlgPathCompound_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-#include <Mod/Path/App/FeaturePath.h>
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/Path/App/FeaturePathCompound.h>
 
 #include "ViewProviderPathCompound.h"
 
+
 class Ui_TaskDlgPathCompound;
 
 namespace PathGui {
diff --git a/src/Mod/Path/Gui/ViewProviderArea.cpp b/src/Mod/Path/Gui/ViewProviderArea.cpp
index 1e8f28a8e2..8a2cca3282 100644
--- a/src/Mod/Path/Gui/ViewProviderArea.cpp
+++ b/src/Mod/Path/Gui/ViewProviderArea.cpp
@@ -22,13 +22,12 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <Gui/Application.h>
 #include <Mod/Path/App/FeatureArea.h>
+
 #include "ViewProviderArea.h"
 
+
 using namespace PathGui;
 
 PROPERTY_SOURCE(PathGui::ViewProviderArea, PartGui::ViewProviderPlaneParametric)
diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/Path/Gui/ViewProviderPath.cpp
index 0d8a10e6d4..63b24a4bae 100644
--- a/src/Mod/Path/Gui/ViewProviderPath.cpp
+++ b/src/Mod/Path/Gui/ViewProviderPath.cpp
@@ -23,42 +23,35 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <boost/algorithm/string/replace.hpp>
+
 # include <Inventor/SbVec3f.h>
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoTransform.h>
-# include <Inventor/nodes/SoRotation.h>
+# include <Inventor/details/SoLineDetail.h>
 # include <Inventor/nodes/SoBaseColor.h>
-# include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/nodes/SoIndexedLineSet.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoPointSet.h>
-# include <Inventor/nodes/SoShapeHints.h>
-# include <Inventor/details/SoLineDetail.h>
+# include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoSwitch.h>
-# include <Inventor/nodes/SoAnnotation.h>
-# include <QFile>
+# include <Inventor/nodes/SoTransform.h>
 #endif
 
-#include <boost/algorithm/string/replace.hpp>
+#include <App/Application.h>
+#include <App/DocumentObject.h>
+#include <Base/Parameter.h>
+#include <Base/Stream.h>
+#include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/SoAxisCrossKit.h>
+#include <Gui/SoFCBoundingBox.h>
+#include <Gui/SoFCUnifiedSelection.h>
+#include <Mod/Path/App/FeaturePath.h>
+#include <Mod/Path/App/PathSegmentWalker.h>
 
 #include "ViewProviderPath.h"
 
-#include <Mod/Path/App/FeaturePath.h>
-#include <Mod/Path/App/Path.h>
-#include <Mod/Path/App/PathSegmentWalker.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <Base/FileInfo.h>
-#include <Base/Stream.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/SoFCBoundingBox.h>
-#include <Gui/SoAxisCrossKit.h>
-#include <Gui/SoFCUnifiedSelection.h>
 
 using namespace Gui;
 using namespace PathGui;
diff --git a/src/Mod/Path/Gui/ViewProviderPath.h b/src/Mod/Path/Gui/ViewProviderPath.h
index caac1ef18e..9b5b4c1762 100644
--- a/src/Mod/Path/Gui/ViewProviderPath.h
+++ b/src/Mod/Path/Gui/ViewProviderPath.h
@@ -20,17 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PATH_ViewProviderPath_H
 #define PATH_ViewProviderPath_H
 
 #include <App/PropertyGeo.h>
 #include <Gui/Selection.h>
 #include <Gui/ViewProviderGeometryObject.h>
-#include <Gui/SoFCSelection.h>
 #include <Gui/ViewProviderPythonFeature.h>
 #include <Mod/Part/Gui/SoBrepEdgeSet.h>
 
+
 class SoCoordinate3;
 class SoDrawStyle;
 class SoMaterial;
diff --git a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp b/src/Mod/Path/Gui/ViewProviderPathCompound.cpp
index bf25db0cce..a6d72afa0e 100644
--- a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp
+++ b/src/Mod/Path/Gui/ViewProviderPathCompound.cpp
@@ -20,16 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include <Gui/Control.h>
 #include <Gui/BitmapFactory.h>
-
-#include <Mod/Path/App/FeaturePathCompound.h>
+#include <Gui/Control.h>
 
 #include "TaskDlgPathCompound.h"
 
diff --git a/src/Mod/Path/Gui/ViewProviderPathShape.cpp b/src/Mod/Path/Gui/ViewProviderPathShape.cpp
index bbb9b88e8a..cb0b45cdf3 100644
--- a/src/Mod/Path/Gui/ViewProviderPathShape.cpp
+++ b/src/Mod/Path/Gui/ViewProviderPathShape.cpp
@@ -20,18 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include <Gui/BitmapFactory.h>
 #include <Gui/Application.h>
-#include <Mod/Part/App/PartFeature.h>
+#include <Gui/BitmapFactory.h>
 #include <Mod/Path/App/FeaturePathShape.h>
+
 #include "ViewProviderPathShape.h"
 
+
 using namespace Gui;
 using namespace PathGui;