diff --git a/src/Gui/DlgMacroExecuteImp.cpp b/src/Gui/DlgMacroExecuteImp.cpp
index 9233326010..89bf6704eb 100644
--- a/src/Gui/DlgMacroExecuteImp.cpp
+++ b/src/Gui/DlgMacroExecuteImp.cpp
@@ -20,34 +20,31 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QInputDialog>
 # include <QLabel>
-# include <QHeaderView>
 # include <QMessageBox>
 # include <QComboBox>
 # include <QSignalBlocker>
 #endif
 
+#include <App/Document.h>
+#include <Base/Interpreter.h>
+
 #include "DlgMacroExecuteImp.h"
 #include "ui_DlgMacroExecute.h"
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "MainWindow.h"
-#include "FileDialog.h"
-#include "Macro.h"
-#include "Document.h"
-#include "EditorView.h"
-#include "PythonEditor.h"
 #include "DlgCustomizeImp.h"
 #include "DlgToolbarsImp.h"
+#include "Document.h"
+#include "EditorView.h"
+#include "Macro.h"
+#include "MainWindow.h"
+#include "PythonEditor.h"
 
-#include <App/Application.h>
-#include <App/Document.h>
-#include <Base/Interpreter.h>
 
 using namespace Gui;
 using namespace Gui::Dialog;
diff --git a/src/Gui/DlgMacroExecuteImp.h b/src/Gui/DlgMacroExecuteImp.h
index be876fad9a..ced31d1585 100644
--- a/src/Gui/DlgMacroExecuteImp.h
+++ b/src/Gui/DlgMacroExecuteImp.h
@@ -24,9 +24,9 @@
 #ifndef GUI_DIALOG_DLGMACROEXECUTEIMP_H
 #define GUI_DIALOG_DLGMACROEXECUTEIMP_H
 
-#include "Window.h"
 #include <QDialog>
 #include <memory>
+#include "Window.h"
 
 class QTreeWidgetItem;
 
diff --git a/src/Gui/DlgMacroRecordImp.cpp b/src/Gui/DlgMacroRecordImp.cpp
index b763675a86..95b359dc9b 100644
--- a/src/Gui/DlgMacroRecordImp.cpp
+++ b/src/Gui/DlgMacroRecordImp.cpp
@@ -20,21 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QMessageBox>
 # include <QDir>
 # include <QFile>
 # include <QFileInfo>
+# include <QMessageBox>
 #endif
 
-#include "Macro.h"
-#include "Application.h"
-#include "MainWindow.h"
 #include "DlgMacroRecordImp.h"
 #include "ui_DlgMacroRecord.h"
+#include "Application.h"
 #include "FileDialog.h"
+#include "Macro.h"
+#include "MainWindow.h"
 
 
 using namespace Gui::Dialog;
diff --git a/src/Gui/DlgMacroRecordImp.h b/src/Gui/DlgMacroRecordImp.h
index 243a61aead..2ee992749d 100644
--- a/src/Gui/DlgMacroRecordImp.h
+++ b/src/Gui/DlgMacroRecordImp.h
@@ -24,10 +24,9 @@
 #ifndef GUI_DIALOG_DLGMACRORECORDIMP_H
 #define GUI_DIALOG_DLGMACRORECORDIMP_H
 
-#include "Window.h"
 #include <QDialog>
 #include <memory>
-
+#include "Window.h"
 
 namespace Gui {
 class MacroManager;
diff --git a/src/Gui/DlgMaterialPropertiesImp.cpp b/src/Gui/DlgMaterialPropertiesImp.cpp
index 96159d8b21..3a2d48defb 100644
--- a/src/Gui/DlgMaterialPropertiesImp.cpp
+++ b/src/Gui/DlgMaterialPropertiesImp.cpp
@@ -20,18 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include <App/PropertyStandard.h>
-#include <App/Material.h>
 
 #include "DlgMaterialPropertiesImp.h"
 #include "ui_DlgMaterialProperties.h"
-#include "Widgets.h"
-#include "SpinBox.h"
 #include "ViewProvider.h"
 
+
 using namespace Gui::Dialog;
 
 
diff --git a/src/Gui/DlgMaterialPropertiesImp.h b/src/Gui/DlgMaterialPropertiesImp.h
index e91103fb08..9ba6a60a83 100644
--- a/src/Gui/DlgMaterialPropertiesImp.h
+++ b/src/Gui/DlgMaterialPropertiesImp.h
@@ -25,8 +25,8 @@
 #define GUI_DIALOG_DLGMATERIALPROPERTIES_IMP_H
 
 #include <QDialog>
-#include <vector>
 #include <memory>
+#include <vector>
 
 namespace Gui {
 class ViewProvider;
diff --git a/src/Gui/DlgObjectSelection.cpp b/src/Gui/DlgObjectSelection.cpp
index 7c194d4a28..c829c74666 100644
--- a/src/Gui/DlgObjectSelection.cpp
+++ b/src/Gui/DlgObjectSelection.cpp
@@ -19,20 +19,21 @@
  *   Suite 330, Boston, MA  02111-1307, USA                                 *
  *                                                                          *
  ****************************************************************************/
+
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QTreeWidget>
 # include <QPushButton>
+# include <QTreeWidget>
 #endif
 
-#include <Base/Console.h>
-#include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
+
 #include "DlgObjectSelection.h"
+#include "ui_DlgObjectSelection.h"
 #include "Application.h"
 #include "ViewProviderDocumentObject.h"
-#include "ui_DlgObjectSelection.h"
+
 
 FC_LOG_LEVEL_INIT("Gui",true,true)
 
diff --git a/src/Gui/DlgOnlineHelpImp.cpp b/src/Gui/DlgOnlineHelpImp.cpp
index 9fef7bb2aa..1fe6dff3ed 100644
--- a/src/Gui/DlgOnlineHelpImp.cpp
+++ b/src/Gui/DlgOnlineHelpImp.cpp
@@ -20,19 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QMessageBox>
 # include <QDir>
+# include <QMessageBox>
 #endif
 
+#include <App/Application.h>
+
 #include "DlgOnlineHelpImp.h"
 #include "ui_DlgOnlineHelp.h"
-#include "PrefWidgets.h"
 
-#include <Base/Parameter.h>
-#include <App/Application.h>
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgParameterFind.cpp b/src/Gui/DlgParameterFind.cpp
index 8d2cc3fd03..d05be2e58b 100644
--- a/src/Gui/DlgParameterFind.cpp
+++ b/src/Gui/DlgParameterFind.cpp
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QMessageBox>
 # include <QPushButton>
 #endif
 
-#include "ui_DlgParameterFind.h"
 #include "DlgParameterFind.h"
+#include "ui_DlgParameterFind.h"
 #include "DlgParameterImp.h"
 
 
diff --git a/src/Gui/DlgParameterFind.h b/src/Gui/DlgParameterFind.h
index 20fddd7ff7..8d0a61915b 100644
--- a/src/Gui/DlgParameterFind.h
+++ b/src/Gui/DlgParameterFind.h
@@ -25,7 +25,6 @@
 #define GUI_DIALOG_DLGPARAMETERFIND_H
 
 #include <QDialog>
-#include <Base/Parameter.h>
 
 class QTreeWidgetItem;
 
diff --git a/src/Gui/DlgParameterImp.cpp b/src/Gui/DlgParameterImp.cpp
index 35d8db2108..0862e50d33 100644
--- a/src/Gui/DlgParameterImp.cpp
+++ b/src/Gui/DlgParameterImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
@@ -33,19 +32,18 @@
 # include <QTreeWidget>
 #endif
 
-#include "ui_DlgParameter.h"
+#include <App/Application.h>
+#include <Base/Exception.h>
+#include <Base/Parameter.h>
+
 #include "DlgParameterImp.h"
+#include "ui_DlgParameter.h"
+#include "BitmapFactory.h"
 #include "DlgParameterFind.h"
 #include "DlgInputDialogImp.h"
-#include "BitmapFactory.h"
 #include "FileDialog.h"
 #include "SpinBox.h"
 
-#include <Base/Parameter.h>
-#include <Base/Exception.h>
-#include <App/Application.h>
-
-
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgParameterImp.h b/src/Gui/DlgParameterImp.h
index a783c28d9e..8963f066f0 100644
--- a/src/Gui/DlgParameterImp.h
+++ b/src/Gui/DlgParameterImp.h
@@ -26,10 +26,11 @@
 
 #include <Base/Parameter.h>
 
-#include <QTreeWidgetItem>
-#include <QTreeWidget>
 #include <QDialog>
 #include <QPointer>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+
 
 namespace Gui {
 namespace Dialog {
diff --git a/src/Gui/DlgPreferencePackManagementImp.cpp b/src/Gui/DlgPreferencePackManagementImp.cpp
index a9ad617964..6134266424 100644
--- a/src/Gui/DlgPreferencePackManagementImp.cpp
+++ b/src/Gui/DlgPreferencePackManagementImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QMessageBox>
@@ -28,11 +27,10 @@
 
 #include "DlgPreferencePackManagementImp.h"
 #include "ui_DlgPreferencePackManagement.h"
-
-#include <PreferencePackManager.h>
-#include <App/Application.h>
 #include "Application.h"
 #include "Command.h"
+#include "PreferencePackManager.h"
+
 
 using namespace Gui::Dialog;
 namespace fs = boost::filesystem;
diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp
index 6126cab463..e3113925f7 100644
--- a/src/Gui/DlgPreferencesImp.cpp
+++ b/src/Gui/DlgPreferencesImp.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <cstring>
 # include <algorithm>
 # include <QApplication>
 # include <QDebug>
-# include <QDesktopWidget>
 # include <QGenericReturnArgument>
 # include <QMessageBox>
 # include <QScreen>
@@ -35,15 +33,16 @@
 # include <QScrollBar>
 #endif
 
-#include <Base/Exception.h>
-#include <Base/Console.h>
 #include <App/Application.h>
+#include <Base/Console.h>
+#include <Base/Exception.h>
+
 #include "DlgPreferencesImp.h"
 #include "ui_DlgPreferences.h"
-#include "PropertyPage.h"
-#include "WidgetFactory.h"
 #include "BitmapFactory.h"
 #include "MainWindow.h"
+#include "WidgetFactory.h"
+
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgProjectInformationImp.cpp b/src/Gui/DlgProjectInformationImp.cpp
index 523560f02b..1216d025bf 100644
--- a/src/Gui/DlgProjectInformationImp.cpp
+++ b/src/Gui/DlgProjectInformationImp.cpp
@@ -20,20 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
+#include <QApplication>
+#include <QByteArray>
+#include <QDesktopServices>
+#include <QUrl>
+#endif
 
 #include <App/Document.h>
-#include <App/PropertyStandard.h>
 
 #include "DlgProjectInformationImp.h"
 #include "ui_DlgProjectInformation.h"
-#include "Document.h"
 
-#include <QApplication>
-#include <QByteArray>
-#include <QUrl>
-#include <QDesktopServices>
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgProjectUtility.cpp b/src/Gui/DlgProjectUtility.cpp
index 66887dccfd..a2a6302572 100644
--- a/src/Gui/DlgProjectUtility.cpp
+++ b/src/Gui/DlgProjectUtility.cpp
@@ -20,19 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
 #include <sstream>
 #include <QDir>
 #include <QMessageBox>
+#endif
 
 #include <App/Document.h>
-#include <App/PropertyStandard.h>
 
 #include "DlgProjectUtility.h"
+#include "ui_DlgProjectUtility.h"
 #include "Application.h"
 #include "Command.h"
-#include "ui_DlgProjectUtility.h"
 
 
 using namespace Gui::Dialog;
diff --git a/src/Gui/DlgPropertyLink.cpp b/src/Gui/DlgPropertyLink.cpp
index df97c57c23..a74e06c1e3 100644
--- a/src/Gui/DlgPropertyLink.cpp
+++ b/src/Gui/DlgPropertyLink.cpp
@@ -20,39 +20,33 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <algorithm>
 # include <sstream>
+# include <QStyledItemDelegate>
 # include <QTreeWidgetItem>
-# include <QMessageBox>
-# include <QPushButton>
 #endif
 
-#include <QStyledItemDelegate>
-
-#include <Base/Interpreter.h>
-#include <Base/Tools.h>
-#include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/GeoFeature.h>
-#include <App/DocumentObserver.h>
 #include <App/ObjectIdentifier.h>
 #include <App/PropertyPythonObject.h>
+#include <Base/Interpreter.h>
+#include <Base/Tools.h>
 
-#include "Document.h"
-#include "View3DInventor.h"
-#include "Tree.h"
-#include "Selection.h"
-#include "PropertyView.h"
-#include "BitmapFactory.h"
 #include "DlgPropertyLink.h"
-#include "Application.h"
-#include "ViewProviderDocumentObject.h"
-#include "MetaTypes.h"
 #include "ui_DlgPropertyLink.h"
+#include "Application.h"
+#include "Document.h"
+#include "BitmapFactory.h"
+#include "PropertyView.h"
+#include "Selection.h"
+#include "Tree.h"
+#include "View3DInventor.h"
+#include "ViewProviderDocumentObject.h"
+
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgPropertyLink.h b/src/Gui/DlgPropertyLink.h
index 29e1156c9c..e7b242e92d 100644
--- a/src/Gui/DlgPropertyLink.h
+++ b/src/Gui/DlgPropertyLink.h
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_DIALOG_DLGPROPERTYLINK_H
 #define GUI_DIALOG_DLGPROPERTYLINK_H
 
 #include <QDialog>
-#include <QAbstractItemView>
-#include <QTimer>
-#include <QPushButton>
 #include <QPointer>
+#include <QPushButton>
+#include <QTimer>
+#include "Selection.h"
 
 #define FC_XLINK_VALUE_INDEX 5
 
diff --git a/src/Gui/DlgReportViewImp.cpp b/src/Gui/DlgReportViewImp.cpp
index 68c6d21807..67fd374d34 100644
--- a/src/Gui/DlgReportViewImp.cpp
+++ b/src/Gui/DlgReportViewImp.cpp
@@ -20,15 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <QMessageBox>
-#endif
 
 #include "DlgReportViewImp.h"
 #include "ui_DlgReportView.h"
-#include "PrefWidgets.h"
 
 
 using namespace Gui::Dialog;
diff --git a/src/Gui/DlgRevertToBackupConfigImp.cpp b/src/Gui/DlgRevertToBackupConfigImp.cpp
index f647a96679..073ce0a699 100644
--- a/src/Gui/DlgRevertToBackupConfigImp.cpp
+++ b/src/Gui/DlgRevertToBackupConfigImp.cpp
@@ -20,21 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QMessageBox>
-# include <QPushButton>
 # include <QDateTime>
+# include <QPushButton>
 #endif
 
 #include "DlgRevertToBackupConfigImp.h"
 #include "ui_DlgRevertToBackupConfig.h"
+#include "Application.h"
+#include "PreferencePackManager.h"
 
-#include <Gui/Application.h>
-#include <Gui/PreferencePackManager.h>
-
-#include <boost/filesystem.hpp>
 
 using namespace Gui;
 using namespace Gui::Dialog;
diff --git a/src/Gui/DlgRunExternal.cpp b/src/Gui/DlgRunExternal.cpp
index 61851f5c92..1ddac4ee2b 100644
--- a/src/Gui/DlgRunExternal.cpp
+++ b/src/Gui/DlgRunExternal.cpp
@@ -20,19 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QFileDialog>
-# include <QMessageBox>
 #endif
 
-#include "Application.h"
-#include "MainWindow.h"
 #include "DlgRunExternal.h"
-#include "FileDialog.h"
-
 #include "ui_DlgRunExternal.h"
+#include "FileDialog.h"
 
 
 using namespace Gui::Dialog;
diff --git a/src/Gui/DlgRunExternal.h b/src/Gui/DlgRunExternal.h
index 108de5241a..e885c74cca 100644
--- a/src/Gui/DlgRunExternal.h
+++ b/src/Gui/DlgRunExternal.h
@@ -20,12 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_DIALOG_DlgRunExternal_H
 #define GUI_DIALOG_DlgRunExternal_H
 
-#include <QProcess>
 #include <QDialog>
+#include <QProcess>
 
 namespace Gui {
 namespace Dialog {
diff --git a/src/Gui/QtAll.h b/src/Gui/QtAll.h
index 1d847e33aa..54034aa598 100644
--- a/src/Gui/QtAll.h
+++ b/src/Gui/QtAll.h
@@ -92,7 +92,6 @@
 #include <QImageWriter>
 #include <qinputdialog.h>
 #include <QItemDelegate>
-#include <QStyledItemDelegate>
 #include <QItemEditorFactory>
 #include <QKeyEvent>
 #include <qlabel.h>
@@ -135,6 +134,7 @@
 #include <qsplitter.h>
 #include <qstatusbar.h>
 #include <qstyle.h>
+#include <QStyledItemDelegate>
 #include <qstylefactory.h>
 #include <QStyleOptionButton>
 #include <QStylePainter>