diff --git a/src/Gui/WaitCursor.cpp b/src/Gui/WaitCursor.cpp
index 8a5a564006..0806b480f9 100644
--- a/src/Gui/WaitCursor.cpp
+++ b/src/Gui/WaitCursor.cpp
@@ -25,7 +25,6 @@
 
 #ifndef _PreComp_
 # include <QApplication>
-# include <QDateTime>
 # include <QMessageBox>
 # include <QProgressDialog>
 # include <QWindow>
diff --git a/src/Gui/WhatsThis.cpp b/src/Gui/WhatsThis.cpp
index 40316cd230..64ceefb705 100644
--- a/src/Gui/WhatsThis.cpp
+++ b/src/Gui/WhatsThis.cpp
@@ -28,8 +28,8 @@
 #endif
 
 #include "WhatsThis.h"
-#include "MainWindow.h"
 #include "Action.h"
+#include "MainWindow.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp
index 5ca34a3aa5..860bf22c60 100644
--- a/src/Gui/WidgetFactory.cpp
+++ b/src/Gui/WidgetFactory.cpp
@@ -23,8 +23,6 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <algorithm>
-# include <limits>
 # include <QApplication>
 # include <QVBoxLayout>
 #endif
@@ -38,18 +36,15 @@
 #endif
 #endif
 
-#include <CXX/Objects.hxx>
 #include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/Interpreter.h>
 
-
 #include "WidgetFactory.h"
-#include "UiLoader.h"
-#include "PythonWrapper.h"
 #include "PrefWidgets.h"
-#include "PropertyPage.h"
+#include "PythonWrapper.h"
+#include "UiLoader.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/WidgetFactory.h b/src/Gui/WidgetFactory.h
index 929483783c..8e958d693b 100644
--- a/src/Gui/WidgetFactory.h
+++ b/src/Gui/WidgetFactory.h
@@ -27,9 +27,8 @@
 #include <vector>
 
 #include <Base/Factory.h>
-#include <Base/PyObjectBase.h>
-#include "DlgPreferencesImp.h"
 #include "DlgCustomizeImp.h"
+#include "DlgPreferencesImp.h"
 #include "PropertyPage.h"
 #include <CXX/Extensions.hxx>
 
diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp
index e5500aec38..3a71d700f5 100644
--- a/src/Gui/Widgets.cpp
+++ b/src/Gui/Widgets.cpp
@@ -46,8 +46,8 @@
 #include <App/ExpressionParser.h>
 
 #include "Widgets.h"
-#include "Application.h"
 #include "Action.h"
+#include "Application.h"
 #include "BitmapFactory.h"
 #include "Command.h"
 #include "DlgExpressionInput.h"
diff --git a/src/Gui/Widgets.h b/src/Gui/Widgets.h
index 11113744db..6e346c2fc1 100644
--- a/src/Gui/Widgets.h
+++ b/src/Gui/Widgets.h
@@ -24,23 +24,23 @@
 #ifndef GUI_WIDGETS_H
 #define GUI_WIDGETS_H
 
-#include <QButtonGroup>
-#include <QDialog>
-#include <QListWidget>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPointer>
-#include <QPushButton>
-#include <QPlainTextEdit>
-#include <QBasicTimer>
-#include <QElapsedTimer>
-#include <QToolButton>
-#include <QModelIndex>
-#include "ExpressionBinding.h"
-#include <Base/Parameter.h>
 #include <memory>
 #include <FCGlobal.h>
 
+#include <QBasicTimer>
+#include <QButtonGroup>
+#include <QDialog>
+#include <QElapsedTimer>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QToolButton>
+
+#include <Base/Parameter.h>
+#include "ExpressionBinding.h"
 
 class QGridLayout;
 class QVBoxLayout;
diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp
index af56378fb8..6fcd71e64a 100644
--- a/src/Gui/Window.cpp
+++ b/src/Gui/Window.cpp
@@ -26,8 +26,8 @@
 #include <qglobal.h>
 #include "Window.h"
 
-#include <Base/Console.h>
 #include <App/Application.h>
+#include <Base/Console.h>
 
 using namespace Gui;
 
diff --git a/src/Gui/Window.h b/src/Gui/Window.h
index add6df1c6a..6a85101d16 100644
--- a/src/Gui/Window.h
+++ b/src/Gui/Window.h
@@ -24,9 +24,7 @@
 #ifndef GUI_WINDOW_H
 #define GUI_WINDOW_H
 
-
 #include <Base/Parameter.h>
-#include "View.h"
 
 namespace Gui {
 
diff --git a/src/Gui/WorkbenchFactory.h b/src/Gui/WorkbenchFactory.h
index 5f92d03bae..7b2ed02a9d 100644
--- a/src/Gui/WorkbenchFactory.h
+++ b/src/Gui/WorkbenchFactory.h
@@ -24,9 +24,9 @@
 #ifndef GUI_WORKBENCHFACTORY_H
 #define GUI_WORKBENCHFACTORY_H
 
-#include <Base/Factory.h>
-#include <string>
 #include <list>
+#include <string>
+#include <Base/Factory.h>
 
 namespace Gui {
 class Workbench;
diff --git a/src/Gui/WorkbenchManager.cpp b/src/Gui/WorkbenchManager.cpp
index ee8466f0d5..d795f0c03e 100644
--- a/src/Gui/WorkbenchManager.cpp
+++ b/src/Gui/WorkbenchManager.cpp
@@ -22,19 +22,14 @@
 
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <sstream>
-#endif
 
 #include <Base/Console.h>
-#include <Base/Exception.h>
+
 #include "WorkbenchManager.h"
 #include "Workbench.h"
+#include "DockWindowManager.h"
 #include "MenuManager.h"
 #include "ToolBarManager.h"
-#include "ToolBoxManager.h"
-#include "DockWindowManager.h"
-#include "MainWindow.h"
 
 using namespace Gui;