diff --git a/src/Gui/ApplicationPy.cpp b/src/Gui/ApplicationPy.cpp
index a4ba8ac936..d2e79f227d 100644
--- a/src/Gui/ApplicationPy.cpp
+++ b/src/Gui/ApplicationPy.cpp
@@ -25,49 +25,48 @@
 
 #ifndef _PreComp_
 # include <QApplication>
-# include <qfileinfo.h>
-# include <qdir.h>
+# include <QDir>
 # include <QPrinter>
 # include <QFileInfo>
+# include <Inventor/MarkerBitmaps.h>
 # include <Inventor/SoInput.h>
 # include <Inventor/actions/SoGetPrimitiveCountAction.h>
 # include <Inventor/nodes/SoSeparator.h>
 #endif
 
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/TranscodingException.hpp>
 #include <boost/regex.hpp>
+#include <xercesc/util/TranscodingException.hpp>
+#include <CXX/Objects.hxx>
 
-#include "Action.h"
-#include "Application.h"
-#include "BitmapFactory.h"
-#include "Command.h"
-#include "Document.h"
-#include "MainWindow.h"
-#include "MainWindowPy.h"
-#include "Macro.h"
-#include "EditorView.h"
-#include "PythonEditor.h"
-#include "SoFCDB.h"
-#include "View3DInventor.h"
-#include "SplitView3DInventor.h"
-#include "ViewProvider.h"
-#include "WaitCursor.h"
-#include "PythonWrapper.h"
-#include "WidgetFactory.h"
-#include "Workbench.h"
-#include "WorkbenchManager.h"
-#include "Language/Translator.h"
-#include "DownloadManager.h"
-#include "DlgPreferencesImp.h"
-#include "DocumentObserverPython.h"
 #include <App/DocumentObjectPy.h>
 #include <App/DocumentPy.h>
 #include <App/PropertyFile.h>
 #include <Base/Interpreter.h>
 #include <Base/Console.h>
-#include <CXX/Objects.hxx>
-#include <Inventor/MarkerBitmaps.h>
+#include <Language/Translator.h>
+
+#include "Application.h"
+#include "BitmapFactory.h"
+#include "Command.h"
+#include "DlgPreferencesImp.h"
+#include "Document.h"
+#include "DocumentObserverPython.h"
+#include "DownloadManager.h"
+#include "EditorView.h"
+#include "Macro.h"
+#include "MainWindow.h"
+#include "MainWindowPy.h"
+#include "PythonEditor.h"
+#include "PythonWrapper.h"
+#include "SoFCDB.h"
+#include "SplitView3DInventor.h"
+#include "View3DInventor.h"
+#include "ViewProvider.h"
+#include "WaitCursor.h"
+#include "WidgetFactory.h"
+#include "Workbench.h"
+#include "WorkbenchManager.h"
+
 
 using namespace Gui;
 
diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp
index e1402f4a26..265f1dbf57 100644
--- a/src/Gui/PythonConsole.cpp
+++ b/src/Gui/PythonConsole.cpp
@@ -26,35 +26,29 @@
 # include <QApplication>
 # include <QClipboard>
 # include <QDockWidget>
-# include <QGridLayout>
-# include <QHBoxLayout>
 # include <QKeyEvent>
 # include <QMenu>
 # include <QMessageBox>
-# include <QPushButton>
-# include <QSpacerItem>
+# include <QMimeData>
 # include <QTextCursor>
 # include <QTextDocumentFragment>
 # include <QTextStream>
 # include <QUrl>
-# include <QMimeData>
 #endif
 
-#include "PythonConsole.h"
-#include "PythonConsolePy.h"
-#include "CallTips.h"
-#include "Application.h"
-#include "Action.h"
-#include "Command.h"
-#include "DlgEditorImp.h"
-#include "FileDialog.h"
-#include "MainWindow.h"
-#include "Tools.h"
-
 #include <Base/Interpreter.h>
 #include <Base/Exception.h>
 #include <CXX/Exception.hxx>
 
+#include "PythonConsole.h"
+#include "PythonConsolePy.h"
+#include "Application.h"
+#include "CallTips.h"
+#include "FileDialog.h"
+#include "MainWindow.h"
+#include "Tools.h"
+
+
 using namespace Gui;
 
 namespace Gui
diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp
index f0206902a9..ec6dc97d3d 100644
--- a/src/Gui/ViewProviderLink.cpp
+++ b/src/Gui/ViewProviderLink.cpp
@@ -38,23 +38,19 @@
 # include <Inventor/nodes/SoTransform.h>
 # include <Inventor/sensors/SoNodeSensor.h>
 # include <Inventor/SoPickedPoint.h>
+#include <QApplication>
+#include <QMenu>
 #endif
 
 #include <atomic>
-#include <cctype>
-#include <QApplication>
-#include <QFileInfo>
-#include <QMenu>
-
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost_bind_bind.hpp>
-#include <Base/BoundBoxPy.h>
-#include <Base/Console.h>
-#include <Base/PlacementPy.h>
-#include <Base/MatrixPy.h>
-#include <Base/Tools.h>
+#include <cctype>
 #include <App/ComplexGeoData.h>
-#include <App/GeoFeature.h>
+#include <Base/BoundBoxPy.h>
+#include <Base/MatrixPy.h>
+#include <Base/PlacementPy.h>
+#include <Base/Tools.h>
 #include <Gui/BitmapFactory.h>
 
 #include "ViewProviderLink.h"
@@ -62,9 +58,7 @@
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Control.h"
-#include "Document.h"
 #include "LinkViewPy.h"
-#include "MainWindow.h"
 #include "Selection.h"
 #include "SoFCCSysDragger.h"
 #include "SoFCUnifiedSelection.h"
@@ -73,7 +67,7 @@
 #include "View3DInventor.h"
 #include "ViewParams.h"
 #include "ViewProviderGeometryObject.h"
-#include "ViewProviderGroupExtension.h"
+
 
 FC_LOG_LEVEL_INIT("App::Link",true,true)
 
diff --git a/src/Gui/ViewProviderPythonFeature.cpp b/src/Gui/ViewProviderPythonFeature.cpp
index 7b1c946844..df7dc594fa 100644
--- a/src/Gui/ViewProviderPythonFeature.cpp
+++ b/src/Gui/ViewProviderPythonFeature.cpp
@@ -31,41 +31,22 @@
 # include <QMenu>
 # include <QPixmap>
 # include <boost_bind_bind.hpp>
-# include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/actions/SoSearchAction.h>
-# include <Inventor/draggers/SoDragger.h>
-# include <Inventor/manips/SoCenterballManip.h>
-# include <Inventor/nodes/SoBaseColor.h>
-# include <Inventor/nodes/SoCamera.h>
-# include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoSwitch.h>
-# include <Inventor/nodes/SoDirectionalLight.h>
-# include <Inventor/sensors/SoNodeSensor.h>
 # include <Inventor/SoPickedPoint.h>
-# include <Inventor/actions/SoRayPickAction.h>
 # include <Inventor/details/SoDetail.h>
 #endif
 
-#include "ViewProviderDocumentObjectPy.h"
+#include <App/DocumentObjectPy.h>
+#include <Base/Interpreter.h>
+#include <Base/Tools.h>
+
 #include "ViewProviderPythonFeature.h"
-#include "Tree.h"
-#include "Window.h"
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Document.h"
 #include "PythonWrapper.h"
 #include "View3DInventorViewer.h"
-#include <App/DocumentObjectPy.h>
-#include <App/GeoFeature.h>
-#include <App/PropertyGeo.h>
-#include <Base/Console.h>
-#include <Base/Reader.h>
-#include <Base/Interpreter.h>
-#include <Base/Tools.h>
+#include "ViewProviderDocumentObjectPy.h"
+
 
 FC_LOG_LEVEL_INIT("ViewProviderPythonFeature",true,true)
 
diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp
index 322cc8a8ec..e5500aec38 100644
--- a/src/Gui/Widgets.cpp
+++ b/src/Gui/Widgets.cpp
@@ -23,9 +23,8 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QAction>
 # include <QColorDialog>
-# include <QDesktopWidget>
+# include <QDebug>
 # include <QDesktopServices>
 # include <QDialogButtonBox>
 # include <QDrag>
@@ -39,7 +38,6 @@
 # include <QTextBlock>
 # include <QTimer>
 # include <QToolTip>
-# include <QDebug>
 #endif
 
 #include <Base/Tools.h>
@@ -47,13 +45,13 @@
 #include <Base/Interpreter.h>
 #include <App/ExpressionParser.h>
 
-#include "Command.h"
 #include "Widgets.h"
 #include "Application.h"
 #include "Action.h"
-#include "PrefWidgets.h"
 #include "BitmapFactory.h"
+#include "Command.h"
 #include "DlgExpressionInput.h"
+#include "PrefWidgets.h"
 #include "QuantitySpinBox_p.h"
 #include "Tools.h"
 #include "ui_DlgTreeWidget.h"
@@ -389,7 +387,7 @@ bool AccelLineEdit::isNone() const
 /**
  * Checks which keys are pressed and show it as text.
  */
-void AccelLineEdit::keyPressEvent ( QKeyEvent * e)
+void AccelLineEdit::keyPressEvent (QKeyEvent * e)
 {
     QString txtLine = text();
 
@@ -470,7 +468,7 @@ void AccelLineEdit::keyPressEvent ( QKeyEvent * e)
  * Constructs a line edit with no text.
  * The \a parent argument is sent to the QLineEdit constructor.
  */
-ModifierLineEdit::ModifierLineEdit ( QWidget * parent )
+ModifierLineEdit::ModifierLineEdit (QWidget * parent )
   : QLineEdit(parent)
 {
     setPlaceholderText(tr("Press modifier keys"));
@@ -479,7 +477,7 @@ ModifierLineEdit::ModifierLineEdit ( QWidget * parent )
 /**
  * Checks which modifiers are pressed and show it as text.
  */
-void ModifierLineEdit::keyPressEvent ( QKeyEvent * e)
+void ModifierLineEdit::keyPressEvent (QKeyEvent * e)
 {
     int key = e->key();
     Qt::KeyboardModifiers state = e->modifiers();