diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp
index 1f0b9c97f3..8ed2cbaa8e 100644
--- a/src/Gui/Action.cpp
+++ b/src/Gui/Action.cpp
@@ -24,13 +24,10 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <boost_signals2.hpp>
-# include <boost_bind_bind.hpp>
-# include <QAbstractItemView>
 # include <QActionEvent>
 # include <QApplication>
-# include <QDesktopWidget>
 # include <QEvent>
+# include <QMenu>
 # include <QMessageBox>
 # include <QScreen>
 # include <QTimer>
@@ -38,9 +35,10 @@
 # include <QToolButton>
 #endif
 
+#include <Base/Exception.h>
 #include <Base/Tools.h>
+
 #include "Action.h"
-#include "Application.h"
 #include "BitmapFactory.h"
 #include "Command.h"
 #include "DlgUndoRedo.h"
@@ -54,10 +52,7 @@
 #include "WhatsThis.h"
 #include "Widgets.h"
 #include "Workbench.h"
-#include "WorkbenchManager.h"
 
-#include <Base/Exception.h>
-#include <App/Application.h>
 
 using namespace Gui;
 using namespace Gui::Dialog;
diff --git a/src/Gui/Action.h b/src/Gui/Action.h
index d50deb8cb0..cc49f8ffcc 100644
--- a/src/Gui/Action.h
+++ b/src/Gui/Action.h
@@ -24,7 +24,6 @@
 #ifndef GUI_ACTION_H
 #define GUI_ACTION_H
 
-#include <memory>
 #include <QAction>
 #include <QComboBox>
 #include <QKeySequence>
diff --git a/src/Gui/Application.h b/src/Gui/Application.h
index 426afe1526..977a65b3db 100644
--- a/src/Gui/Application.h
+++ b/src/Gui/Application.h
@@ -25,9 +25,8 @@
 #define APPLICATION_H
 
 #include <QPixmap>
-#include <string>
-#include <vector>
 #include <map>
+#include <string>
 
 #define  putpix()
 
diff --git a/src/Gui/Assistant.cpp b/src/Gui/Assistant.cpp
index e905fe8dfd..421a81ac7d 100644
--- a/src/Gui/Assistant.cpp
+++ b/src/Gui/Assistant.cpp
@@ -24,18 +24,18 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <QCoreApplication>
 # include <QDir>
 # include <QFileInfo>
 # include <QLibraryInfo>
 # include <QMessageBox>
 # include <QProcess>
 # include <QTextStream>
-# include <QCoreApplication>
 #endif
 
-#include "Assistant.h"
-#include <Base/Console.h>
 #include <App/Application.h>
+#include <Base/Console.h>
+#include "Assistant.h"
 
 using namespace Gui;
 
diff --git a/src/Gui/AutoSaver.cpp b/src/Gui/AutoSaver.cpp
index c39d9a7aab..7bc408a681 100644
--- a/src/Gui/AutoSaver.cpp
+++ b/src/Gui/AutoSaver.cpp
@@ -30,25 +30,20 @@
 # include <QRunnable>
 # include <QTextStream>
 # include <QThreadPool>
-# include <boost_bind_bind.hpp>
-# include <sstream>
 #endif
 
-#include "AutoSaver.h"
+#include <App/Application.h>
+#include <App/DocumentObject.h>
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
-#include <Base/Stream.h>
 #include <Base/Tools.h>
 #include <Base/Writer.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
 
+#include "AutoSaver.h"
 #include "Document.h"
-#include "WaitCursor.h"
-#include "Widgets.h"
 #include "MainWindow.h"
 #include "ViewProvider.h"
+#include "WaitCursor.h"
 
 FC_LOG_LEVEL_INIT("App",true,true)
 
diff --git a/src/Gui/AutoSaver.h b/src/Gui/AutoSaver.h
index 0c6c36bd3b..41944c91c1 100644
--- a/src/Gui/AutoSaver.h
+++ b/src/Gui/AutoSaver.h
@@ -25,11 +25,12 @@
 #define GUI_AUTOSAVER_H
 
 #include <QObject>
-#include <Base/Writer.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <boost_signals2.hpp>
+#include <Base/Writer.h>
 
 namespace App {
 class Document;
diff --git a/src/Gui/BitmapFactory.cpp b/src/Gui/BitmapFactory.cpp
index 2e9ffd7156..d09329b4de 100644
--- a/src/Gui/BitmapFactory.cpp
+++ b/src/Gui/BitmapFactory.cpp
@@ -23,7 +23,6 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QString>
 # include <QApplication>
 # include <QBitmap>
 # include <QDir>
@@ -33,16 +32,16 @@
 # include <QImageReader>
 # include <QPainter>
 # include <QPalette>
+# include <QString>
 # include <QSvgRenderer>
 # include <QStyleOption>
-# include <sstream>
 #endif
 
 #include <string>
 #include <Inventor/fields/SoSFImage.h>
 
-#include <Base/Console.h>
 #include <App/Application.h>
+#include <Base/Console.h>
 
 #include "BitmapFactory.h"
 
diff --git a/src/Gui/Command.h b/src/Gui/Command.h
index ead59c13d4..c30473735e 100644
--- a/src/Gui/Command.h
+++ b/src/Gui/Command.h
@@ -24,11 +24,7 @@
 #ifndef GUI_COMMAND_H
 #define GUI_COMMAND_H
 
-
 #include <list>
-#include <map>
-#include <string>
-#include <vector>
 
 #include <Base/Type.h>
 #include <Gui/Application.h>
diff --git a/src/Gui/Control.cpp b/src/Gui/Control.cpp
index 4deff44791..0e14cab451 100644
--- a/src/Gui/Control.cpp
+++ b/src/Gui/Control.cpp
@@ -31,14 +31,13 @@
 # include <QPointer>
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include "Control.h"
-#include "TaskView/TaskView.h"
-
 #include <App/AutoTransaction.h>
-#include <Gui/MainWindow.h>
 #include <Gui/ComboView.h>
 #include <Gui/DockWindowManager.h>
+#include <Gui/MainWindow.h>
+
+#include "Control.h"
+#include "TaskView/TaskView.h"
 
 
 using namespace Gui;