diff --git a/src/Gui/DlgSettings3DViewImp.cpp b/src/Gui/DlgSettings3DViewImp.cpp
index 5459ff4c91..93c9423d63 100644
--- a/src/Gui/DlgSettings3DViewImp.cpp
+++ b/src/Gui/DlgSettings3DViewImp.cpp
@@ -20,30 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <QApplication>
-# include <QDoubleSpinBox>
-# include <QRegExp>
-# include <QGridLayout>
 # include <QMessageBox>
-# include <memory>
 #endif
 
+#include <App/Application.h>
+#include <Base/Parameter.h>
+#include <Base/Tools.h>
+
 #include "DlgSettings3DViewImp.h"
 #include "ui_DlgSettings3DView.h"
-#include "MainWindow.h"
-#include "NavigationStyle.h"
-#include "PrefWidgets.h"
-#include "View3DInventor.h"
 #include "View3DInventorViewer.h"
-#include "ui_MouseButtons.h"
-#include <App/Application.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Tools.h>
+
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgSettingsCacheDirectory.cpp b/src/Gui/DlgSettingsCacheDirectory.cpp
index c01c4391dd..82faa4ba94 100644
--- a/src/Gui/DlgSettingsCacheDirectory.cpp
+++ b/src/Gui/DlgSettingsCacheDirectory.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -32,16 +31,18 @@
 # include <QMessageBox>
 # include <QSettings>
 # include <QUrl>
-# include <climits>
 # include <cmath>
+# include <vector>
 #endif
 
+#include <App/Application.h>
+#include <App/Document.h>
+
 #include "DlgSettingsCacheDirectory.h"
 #include "ui_DlgSettingsCacheDirectory.h"
 #include "DocumentRecovery.h"
 #include "MainWindow.h"
-#include <App/Application.h>
-#include <App/Document.h>
+
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgSettingsColorGradientImp.cpp b/src/Gui/DlgSettingsColorGradientImp.cpp
index eeb31312ff..dd4eb0fdc6 100644
--- a/src/Gui/DlgSettingsColorGradientImp.cpp
+++ b/src/Gui/DlgSettingsColorGradientImp.cpp
@@ -20,22 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <cmath>
+# include <QDoubleValidator>
 # include <QLocale>
 # include <QMessageBox>
-# include <QDoubleValidator>
-#endif
-
-#ifndef _PreComp_
-#include <cmath>
 #endif
 
 #include "DlgSettingsColorGradientImp.h"
 #include "ui_DlgSettingsColorGradient.h"
 #include "SpinBox.h"
 
+
 using namespace Gui::Dialog;
 
 /* TRANSLATOR Gui::Dialog::DlgSettingsColorGradientImp */
diff --git a/src/Gui/DlgSettingsDocumentImp.cpp b/src/Gui/DlgSettingsDocumentImp.cpp
index e973043a82..08a50a67f4 100644
--- a/src/Gui/DlgSettingsDocumentImp.cpp
+++ b/src/Gui/DlgSettingsDocumentImp.cpp
@@ -20,16 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#include <climits>
+
 #include <zlib.h>
 
 #include "DlgSettingsDocumentImp.h"
 #include "ui_DlgSettingsDocument.h"
-#include "PrefWidgets.h"
 #include "AutoSaver.h"
 
+
 using namespace Gui::Dialog;
 
 /* TRANSLATOR Gui::Dialog::DlgSettingsDocumentImp */
diff --git a/src/Gui/DlgSettingsImageImp.cpp b/src/Gui/DlgSettingsImageImp.cpp
index e6d271091e..c2b3b7409b 100644
--- a/src/Gui/DlgSettingsImageImp.cpp
+++ b/src/Gui/DlgSettingsImageImp.cpp
@@ -20,12 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include "DlgSettingsImageImp.h"
 #include "ui_DlgSettingsImage.h"
-#include "SpinBox.h"
+
 
 using namespace Gui::Dialog;
 using namespace std;
diff --git a/src/Gui/DlgSettingsImageImp.h b/src/Gui/DlgSettingsImageImp.h
index 1e079b3750..7c9a8fed00 100644
--- a/src/Gui/DlgSettingsImageImp.h
+++ b/src/Gui/DlgSettingsImageImp.h
@@ -20,12 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_DIALOG_DLGSETTINGSIMAGE_IMP_H
 #define GUI_DIALOG_DLGSETTINGSIMAGE_IMP_H
 
-#include <Inventor/SoOffscreenRenderer.h>
 #include <Inventor/SbMatrix.h>
+#include <Inventor/SoOffscreenRenderer.h>
 
 #include <QWidget>
 #include <memory>
diff --git a/src/Gui/DlgSettingsLazyLoadedImp.cpp b/src/Gui/DlgSettingsLazyLoadedImp.cpp
index 9d0a9b9bfa..7b15d3a431 100644
--- a/src/Gui/DlgSettingsLazyLoadedImp.cpp
+++ b/src/Gui/DlgSettingsLazyLoadedImp.cpp
@@ -20,21 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
+#include <QCheckBox>
+#include <QPushButton>
+#include <sstream>
+#endif
 
 #include "DlgSettingsLazyLoadedImp.h"
 #include "ui_DlgSettingsLazyLoaded.h"
-#include "PrefWidgets.h"
-#include "AutoSaver.h"
-
 #include "Application.h"
-#include "WorkbenchManager.h"
 #include "Workbench.h"
+#include "WorkbenchManager.h"
 
-#include <QCheckBox>
-
-#include <sstream>
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgSettingsMacroImp.cpp b/src/Gui/DlgSettingsMacroImp.cpp
index f8f2b7c16c..4f86e7ea07 100644
--- a/src/Gui/DlgSettingsMacroImp.cpp
+++ b/src/Gui/DlgSettingsMacroImp.cpp
@@ -20,8 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #include "DlgSettingsMacroImp.h"
 #include "ui_DlgSettingsMacro.h"
 #include "Action.h"
diff --git a/src/Gui/DlgSettingsNavigation.cpp b/src/Gui/DlgSettingsNavigation.cpp
index 5f7d280243..bae79fd0e0 100644
--- a/src/Gui/DlgSettingsNavigation.cpp
+++ b/src/Gui/DlgSettingsNavigation.cpp
@@ -20,30 +20,27 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <QApplication>
 # include <QDoubleSpinBox>
-# include <QRegExp>
 # include <QGridLayout>
-# include <QMessageBox>
 # include <memory>
 #endif
 
+#include <App/Application.h>
+#include <Base/Parameter.h>
+#include <Base/Tools.h>
+
 #include "DlgSettingsNavigation.h"
 #include "ui_DlgSettingsNavigation.h"
 #include "MainWindow.h"
 #include "NavigationStyle.h"
-#include "PrefWidgets.h"
 #include "View3DInventor.h"
 #include "View3DInventorViewer.h"
 #include "ui_MouseButtons.h"
-#include <App/Application.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Tools.h>
+
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgSettingsNavigation.h b/src/Gui/DlgSettingsNavigation.h
index eaed6e77b5..2cadd89a77 100644
--- a/src/Gui/DlgSettingsNavigation.h
+++ b/src/Gui/DlgSettingsNavigation.h
@@ -24,8 +24,9 @@
 #ifndef GUI_DIALOG_DLGSETTINGSNAVIGATION_H
 #define GUI_DIALOG_DLGSETTINGSNAVIGATION_H
 
-#include "PropertyPage.h"
 #include <memory>
+#include "PropertyPage.h"
+#include <QDialog>
 
 class QDoubleSpinBox;
 
diff --git a/src/Gui/DlgSettingsPythonConsole.cpp b/src/Gui/DlgSettingsPythonConsole.cpp
index 69bf6aa8d3..5a52b40bb0 100644
--- a/src/Gui/DlgSettingsPythonConsole.cpp
+++ b/src/Gui/DlgSettingsPythonConsole.cpp
@@ -20,15 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "DlgSettingsPythonConsole.h"
 #include "ui_DlgSettingsPythonConsole.h"
-#include <App/Application.h>
+
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgSettingsSelection.cpp b/src/Gui/DlgSettingsSelection.cpp
index 7ac6ddc2a2..4fd6c5c10f 100644
--- a/src/Gui/DlgSettingsSelection.cpp
+++ b/src/Gui/DlgSettingsSelection.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
+#include <App/Application.h>
 
 #include "DlgSettingsSelection.h"
 #include "ui_DlgSettingsSelection.h"
-#include <App/Application.h>
+
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/DlgSettingsUnitsImp.cpp b/src/Gui/DlgSettingsUnitsImp.cpp
index cb4c3e701f..6ea6e9bde4 100644
--- a/src/Gui/DlgSettingsUnitsImp.cpp
+++ b/src/Gui/DlgSettingsUnitsImp.cpp
@@ -20,24 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <limits>
 # include <QApplication>
-# include <QRegExp>
 #endif
 
-#include <limits>
+#include <App/Application.h>
+#include <Base/Parameter.h>
+#include <Base/UnitsApi.h>
 
 #include "ui_DlgSettingsUnits.h"
 #include "DlgSettingsUnitsImp.h"
-#include "NavigationStyle.h"
-#include "PrefWidgets.h"
-#include <App/Application.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/UnitsApi.h>
+
 
 using namespace Gui::Dialog;
 using namespace Base;
diff --git a/src/Gui/DlgSettingsViewColor.cpp b/src/Gui/DlgSettingsViewColor.cpp
index 972bf40de9..748559953d 100644
--- a/src/Gui/DlgSettingsViewColor.cpp
+++ b/src/Gui/DlgSettingsViewColor.cpp
@@ -20,15 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "DlgSettingsViewColor.h"
 #include "ui_DlgSettingsViewColor.h"
-#include "PrefWidgets.h"
+
 
 using namespace Gui::Dialog;