diff --git a/src/Gui/EditorView.cpp b/src/Gui/EditorView.cpp
index 8180a66253..1cd537529a 100644
--- a/src/Gui/EditorView.cpp
+++ b/src/Gui/EditorView.cpp
@@ -23,7 +23,6 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QAbstractTextDocumentLayout>
 # include <QApplication>
 # include <QCheckBox>
 # include <QClipboard>
@@ -32,15 +31,12 @@
 # include <QVBoxLayout>
 # include <QLineEdit>
 # include <QMessageBox>
-# include <QPainter>
 # include <QPrinter>
 # include <QPrintDialog>
-# include <QScrollBar>
 # include <QPlainTextEdit>
 # include <QPrintPreviewDialog>
 # include <QSpacerItem>
 # include <QStyle>
-# include <QTextBlock>
 # include <QTextCodec>
 # include <QTextCursor>
 # include <QTextDocument>
@@ -51,16 +47,15 @@
 
 #include "EditorView.h"
 #include "Application.h"
-#include "BitmapFactory.h"
 #include "FileDialog.h"
 #include "Macro.h"
 #include "MainWindow.h"
-#include "PythonDebugger.h"
 #include "PythonEditor.h"
 
+#include <Base/Exception.h>
 #include <Base/Interpreter.h>
 #include <Base/Parameter.h>
-#include <Base/Exception.h>
+
 
 using namespace Gui;
 namespace Gui {
diff --git a/src/Gui/ExpressionBinding.cpp b/src/Gui/ExpressionBinding.cpp
index 7c6cb24652..619cf45496 100644
--- a/src/Gui/ExpressionBinding.cpp
+++ b/src/Gui/ExpressionBinding.cpp
@@ -26,18 +26,19 @@
 # include <QPixmapCache>
 # include <QStyle>
 #endif
-#include "ExpressionBinding.h"
-#include "QuantitySpinBox_p.h"
+
 #include "BitmapFactory.h"
 #include "Command.h"
-#include <App/Expression.h>
-#include <App/DocumentObject.h>
-#include <Base/Tools.h>
-#include <Base/Console.h>
-#include <App/ObjectIdentifier.h>
-#include <App/Document.h>
+#include "ExpressionBinding.h"
+#include "QuantitySpinBox_p.h"
+
 #include <App/Application.h>
-#include <boost_bind_bind.hpp>
+#include <App/Document.h>
+#include <App/DocumentObject.h>
+#include <App/Expression.h>
+#include <App/ObjectIdentifier.h>
+#include <Base/Tools.h>
+
 
 FC_LOG_LEVEL_INIT("Expression",true,true)
 
diff --git a/src/Gui/ExpressionBinding.h b/src/Gui/ExpressionBinding.h
index a831abe58a..d7454fb577 100644
--- a/src/Gui/ExpressionBinding.h
+++ b/src/Gui/ExpressionBinding.h
@@ -23,12 +23,13 @@
 #ifndef EXPRESSIONBINDING_H
 #define EXPRESSIONBINDING_H
 
+#include <memory>
 #include <string>
 #include <App/ObjectIdentifier.h>
-#include <memory>
-#include <QLabel>
+#include <QPalette>
 #include <boost_signals2.hpp>
 
+
 namespace App {
 class Expression;
 }
diff --git a/src/Gui/ExpressionBindingPy.cpp b/src/Gui/ExpressionBindingPy.cpp
index 811bc77df7..1353019d5f 100644
--- a/src/Gui/ExpressionBindingPy.cpp
+++ b/src/Gui/ExpressionBindingPy.cpp
@@ -21,14 +21,14 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
+
+#include <App/DocumentObjectPy.h>
+
 #include "ExpressionBindingPy.h"
-#include "ExpressionBinding.h"
+#include "InputField.h"
 #include "PythonWrapper.h"
 #include "QuantitySpinBox.h"
-#include "InputField.h"
-#include <App/DocumentObjectPy.h>
+
 
 using namespace Gui;
 
diff --git a/src/Gui/ExpressionCompleter.cpp b/src/Gui/ExpressionCompleter.cpp
index b509e22cd7..7ea6aad5ea 100644
--- a/src/Gui/ExpressionCompleter.cpp
+++ b/src/Gui/ExpressionCompleter.cpp
@@ -23,27 +23,24 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <QContextMenuEvent>
-#include <QStandardItem>
-#include <QStandardItemModel>
-#include <QLineEdit>
 #include <QAbstractItemView>
+#include <QContextMenuEvent>
+#include <QLineEdit>
 #include <QMenu>
 #include <QTextBlock>
 #endif
 
 #include <boost/algorithm/string/predicate.hpp>
 
-#include <Base/Tools.h>
-#include <Base/Console.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <App/DocumentObserver.h>
-#include <App/ObjectIdentifier.h>
-#include "ExpressionCompleter.h"
 #include <App/ExpressionParser.h>
-#include <App/PropertyLinks.h>
+#include <App/ObjectIdentifier.h>
+#include <Base/Tools.h>
+
+#include "ExpressionCompleter.h"
+
 
 FC_LOG_LEVEL_INIT("Completer",true,true)
 
diff --git a/src/Gui/ExpressionCompleter.h b/src/Gui/ExpressionCompleter.h
index 3f76bd49d4..04e04da4a4 100644
--- a/src/Gui/ExpressionCompleter.h
+++ b/src/Gui/ExpressionCompleter.h
@@ -23,12 +23,10 @@
 #ifndef EXPRESSIONCOMPLETER_H
 #define EXPRESSIONCOMPLETER_H
 
-#include <QObject>
 #include <QCompleter>
 #include <QLineEdit>
+#include <QObject>
 #include <QPlainTextEdit>
-#include <set>
-#include <memory>
 #include <App/DocumentObserver.h>
 
 class QStandardItem;
diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp
index 2778d180e9..d6725671fc 100644
--- a/src/Gui/FileDialog.cpp
+++ b/src/Gui/FileDialog.cpp
@@ -26,18 +26,16 @@
 # include <QApplication>
 # include <QButtonGroup>
 # include <QCompleter>
-# include <QComboBox>
-# include <QDesktopServices>
-# include <QDialogButtonBox>
 # include <QDir>
 # include <QGridLayout>
 # include <QGroupBox>
 # include <QLineEdit>
 # include <QPushButton>
 # include <QRadioButton>
+# include <QResizeEvent>
+# include <QStandardPaths>
 # include <QStyle>
 # include <QUrl>
-# include <QResizeEvent>
 #endif
 
 #include <Base/Parameter.h>
@@ -45,9 +43,9 @@
 
 #include "FileDialog.h"
 #include "MainWindow.h"
-#include "BitmapFactory.h"
 #include "Tools.h"
 
+
 using namespace Gui;
 
 bool DialogOptions::dontUseNativeFileDialog()
diff --git a/src/Gui/FileDialog.h b/src/Gui/FileDialog.h
index c69f68a8ba..66fa256986 100644
--- a/src/Gui/FileDialog.h
+++ b/src/Gui/FileDialog.h
@@ -24,10 +24,10 @@
 #ifndef GUI_FILEDIALOG_H
 #define GUI_FILEDIALOG_H
 
+#include <QCompleter>
 #include <QFileDialog>
 #include <QFileIconProvider>
 #include <QFileSystemModel>
-#include <QCompleter>
 #include <QPointer>
 #include <FCGlobal.h>
 
diff --git a/src/Gui/Flag.cpp b/src/Gui/Flag.cpp
index 89d2308405..6cefc45435 100644
--- a/src/Gui/Flag.cpp
+++ b/src/Gui/Flag.cpp
@@ -28,9 +28,10 @@
 # include <Inventor/nodes/SoCamera.h>
 #endif
 #include <Inventor/SbVec2s.h>
-#include "View3DInventorViewer.h"
 
 #include "Flag.h"
+#include "View3DInventorViewer.h"
+
 
 using namespace Gui;
 
diff --git a/src/Gui/Flag.h b/src/Gui/Flag.h
index 18ea5eee3d..3b8f42a6d9 100644
--- a/src/Gui/Flag.h
+++ b/src/Gui/Flag.h
@@ -28,7 +28,6 @@
 #include <QRect>
 #include <QWidgetItem>
 #include <Inventor/SbVec3f.h>
-#include <QtOpenGL.h>
 #include <Gui/GLPainter.h>
 
 namespace Gui {
diff --git a/src/Gui/GuiApplication.cpp b/src/Gui/GuiApplication.cpp
index 014225ac8e..57fdf5cf5a 100644
--- a/src/Gui/GuiApplication.cpp
+++ b/src/Gui/GuiApplication.cpp
@@ -25,12 +25,10 @@
 
 #ifndef _PreComp_
 # include <sstream>
-# include <stdexcept>
 # include <QAbstractSpinBox>
 # include <QByteArray>
 # include <QComboBox>
 # include <QDataStream>
-# include <QDebug>
 # include <QFileInfo>
 # include <QFileOpenEvent>
 # include <QKeyEvent>
@@ -41,24 +39,21 @@
 #include <QLocalServer>
 #include <QLocalSocket>
 
-#if defined(Q_OS_WIN)
-# include <Windows.h>
-#endif
 #if defined(Q_OS_UNIX)
 # include <sys/types.h>
 # include <time.h>
 # include <unistd.h>
 #endif
 
-#include "GuiApplication.h"
-#include "Application.h"
-#include "SpaceballEvent.h"
-#include "MainWindow.h"
-
+#include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
 
-#include <App/Application.h>
+#include "GuiApplication.h"
+#include "Application.h"
+#include "MainWindow.h"
+#include "SpaceballEvent.h"
+
 
 using namespace Gui;
 
diff --git a/src/Gui/GuiApplicationNativeEventAware.cpp b/src/Gui/GuiApplicationNativeEventAware.cpp
index 037ba0b3a5..a2ebbf2ff2 100644
--- a/src/Gui/GuiApplicationNativeEventAware.cpp
+++ b/src/Gui/GuiApplicationNativeEventAware.cpp
@@ -21,18 +21,16 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#include <algorithm>
+
 #include <iomanip>
 #include <sstream>
 
-#include <QGlobalStatic>
 #include <QMainWindow>
-#include <QWidget>
 #include <FCConfig.h>
-#include <Base/Console.h>
+#include "Application.h"
 #include "GuiApplicationNativeEventAware.h"
 #include "SpaceballEvent.h"
-#include "Application.h"
+
 
 #if defined(_USE_3DCONNEXION_SDK) || defined(SPNAV_FOUND)
 #if defined(Q_OS_LINUX)