diff --git a/src/Gui/ReportView.cpp b/src/Gui/ReportView.cpp
index 2e98ab4b7d..c4dc0dbcef 100644
--- a/src/Gui/ReportView.cpp
+++ b/src/Gui/ReportView.cpp
@@ -20,31 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QGridLayout>
 # include <QApplication>
-# include <QMenu>
 # include <QContextMenuEvent>
+# include <QGridLayout>
+# include <QMenu>
 # include <QTextCursor>
 # include <QTextStream>
 # include <QTime>
-# include <QDockWidget>
-# include <QPointer>
 #endif
 
 #include <Base/Interpreter.h>
+
 #include "ReportView.h"
+#include "Application.h"
+#include "BitmapFactory.h"
 #include "DockWindowManager.h"
 #include "FileDialog.h"
 #include "PythonConsole.h"
 #include "PythonConsolePy.h"
-#include "BitmapFactory.h"
-#include "MainWindow.h"
-#include "Application.h"
 #include "Tools.h"
 
+
 using namespace Gui;
 using namespace Gui::DockWnd;
 
diff --git a/src/Gui/ReportView.h b/src/Gui/ReportView.h
index 58b03c8a46..f396e4ffbe 100644
--- a/src/Gui/ReportView.h
+++ b/src/Gui/ReportView.h
@@ -20,19 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_DOCKWND_REPORTVIEW_H
 #define GUI_DOCKWND_REPORTVIEW_H
 
+#include <QPointer>
 #include <QTextEdit>
 #include <QSyntaxHighlighter>
-#include <Base/Console.h>
-#include <QPointer>
-#include <QDockWidget>
-#include "DockWindow.h"
+
 #include "Window.h"
 #include <FCGlobal.h>
 
+
 class QTabWidget;
 
 namespace Gui {
diff --git a/src/Gui/TaskCSysDragger.cpp b/src/Gui/TaskCSysDragger.cpp
index 26f2f2b142..5e95a7a995 100644
--- a/src/Gui/TaskCSysDragger.cpp
+++ b/src/Gui/TaskCSysDragger.cpp
@@ -25,21 +25,19 @@
 #include <assert.h>
 #include <limits>
 #include <QApplication>
+#include <QGridLayout>
 #endif
 
-#include <QGridLayout>
-#include <QFontMetrics>
-
-#include <Gui/TaskView/TaskView.h>
-#include "QuantitySpinBox.h"
-#include <Gui/Application.h>
-#include <Gui/Command.h>
-#include <Gui/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/ViewProviderDragger.h>
-#include <Gui/SoFCCSysDragger.h>
-
+#include "Document.h" // must be before TaskCSysDragger.h
 #include "TaskCSysDragger.h"
+#include "Application.h"
+#include "BitmapFactory.h"
+#include "Command.h"
+#include "QuantitySpinBox.h"
+#include "SoFCCSysDragger.h"
+#include "ViewProviderDragger.h"
+#include "TaskView/TaskView.h"
+
 
 using namespace Gui;
 
diff --git a/src/Gui/TaskCSysDragger.h b/src/Gui/TaskCSysDragger.h
index 5b50850501..4a4e6542ca 100644
--- a/src/Gui/TaskCSysDragger.h
+++ b/src/Gui/TaskCSysDragger.h
@@ -23,8 +23,8 @@
 #ifndef TASKCSYSDRAGGER_H
 #define TASKCSYSDRAGGER_H
 
-#include <Gui/TaskView/TaskDialog.h>
-#include <App/DocumentObserver.h>
+#include "TaskView/TaskDialog.h"
+
 
 namespace Gui
 {
diff --git a/src/Gui/TaskDlgRelocation.cpp b/src/Gui/TaskDlgRelocation.cpp
index 3ae609b505..195c49ba4d 100644
--- a/src/Gui/TaskDlgRelocation.cpp
+++ b/src/Gui/TaskDlgRelocation.cpp
@@ -20,17 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include "ui_DlgLocationPos.h"
 #include "ui_DlgLocationAngle.h"
+#include "ui_DlgLocationPos.h"
 
 #include "TaskDlgRelocation.h"
-#include <Gui/BitmapFactory.h>
+#include "BitmapFactory.h"
+
 
 using namespace Gui;
 
diff --git a/src/Gui/TaskElementColors.cpp b/src/Gui/TaskElementColors.cpp
index 0e0b79603d..953abb3ba6 100644
--- a/src/Gui/TaskElementColors.cpp
+++ b/src/Gui/TaskElementColors.cpp
@@ -28,29 +28,24 @@
 
 #include <QColorDialog>
 
-#include <boost_bind_bind.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
-#include "ui_TaskElementColors.h"
-#include "TaskElementColors.h"
-#include "ViewProviderLink.h"
-
-#include <Base/Console.h>
 #include <App/ComplexGeoData.h>
 
+#include "TaskElementColors.h"
+#include "ui_TaskElementColors.h"
 #include "Application.h"
-#include "Control.h"
-#include "Document.h"
-#include "MainWindow.h"
-#include "Selection.h"
 #include "BitmapFactory.h"
 #include "Command.h"
+#include "Control.h"
+#include "Document.h"
 #include "FileDialog.h"
+#include "Selection.h"
 
-#include <App/Document.h>
-#include <App/DocumentObject.h>
+#include "ViewProviderLink.h"
 
-FC_LOG_LEVEL_INIT("Gui",true,true)
+
+FC_LOG_LEVEL_INIT("Gui", true, true)
 
 using namespace Gui;
 namespace bp = boost::placeholders;
diff --git a/src/Gui/TaskElementColors.h b/src/Gui/TaskElementColors.h
index b3355fc9d5..34bb5b122b 100644
--- a/src/Gui/TaskElementColors.h
+++ b/src/Gui/TaskElementColors.h
@@ -24,8 +24,9 @@
 #define GUI_TASKELEMENTCOLORS_H
 
 #include <QListWidgetItem>
-#include "TaskView/TaskView.h"
 #include "TaskView/TaskDialog.h"
+#include "TaskView/TaskView.h"
+
 
 namespace Gui {
 class Document;
diff --git a/src/Gui/TextDocumentEditorView.cpp b/src/Gui/TextDocumentEditorView.cpp
index 8a4dd94ad4..d60ee70930 100644
--- a/src/Gui/TextDocumentEditorView.cpp
+++ b/src/Gui/TextDocumentEditorView.cpp
@@ -20,28 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QAbstractTextDocumentLayout>
 # include <QApplication>
 # include <QClipboard>
-# include <QString>
 # include <QMessageBox>
 # include <QPushButton>
-# include <QTextBlock>
-# include <iostream>
-# include <boost_bind_bind.hpp>
-# include <boost_signals2.hpp>
+# include <QString>
 #endif
 
-
-#include <App/TextDocument.h>
-#include <Gui/Document.h>
-#include <Gui/Application.h>
-#include <Gui/MainWindow.h>
-
 #include "TextDocumentEditorView.h"
+#include "Application.h"
+#include "Document.h"
+#include "MainWindow.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/TextDocumentEditorView.h b/src/Gui/TextDocumentEditorView.h
index 193b70ec84..28ac3b90fc 100644
--- a/src/Gui/TextDocumentEditorView.h
+++ b/src/Gui/TextDocumentEditorView.h
@@ -20,17 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_TEXTDOCUMENTEDITORVIEW_H
 #define GUI_TEXTDOCUMENTEDITORVIEW_H
 
 #include <string>
-#include <boost_signals2.hpp>
 #include <QPlainTextEdit>
 
 #include <App/TextDocument.h>
 #include <Gui/MDIView.h>
-#include <Gui/Window.h>
 
 
 namespace Gui {
diff --git a/src/Gui/TextEdit.cpp b/src/Gui/TextEdit.cpp
index f832dd2dc2..4b577f61f8 100644
--- a/src/Gui/TextEdit.cpp
+++ b/src/Gui/TextEdit.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -34,6 +33,7 @@
 #include "SyntaxHighlighter.h"
 #include "Tools.h"
 
+
 using namespace Gui;
 
 /**
diff --git a/src/Gui/TextEdit.h b/src/Gui/TextEdit.h
index 4a20c450c0..7793ea0102 100644
--- a/src/Gui/TextEdit.h
+++ b/src/Gui/TextEdit.h
@@ -22,15 +22,14 @@
 
 /* Text completion mechanism */
 
-
 #ifndef GUI_TEXTEDIT_H
 #define GUI_TEXTEDIT_H
 
 #include <QListWidget>
 #include <QPlainTextEdit>
-#include "View.h"
 #include "Window.h"
 
+
 namespace Gui {
 class CompletionBox;
 class SyntaxHighlighter;
diff --git a/src/Gui/TextureMapping.cpp b/src/Gui/TextureMapping.cpp
index 2b39b4c5f9..7e1a3f4fca 100644
--- a/src/Gui/TextureMapping.cpp
+++ b/src/Gui/TextureMapping.cpp
@@ -20,31 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <Inventor/nodes/SoGroup.h>
 # include <Inventor/nodes/SoTexture2.h>
 # include <QImage>
-# include <QMessageBox>
 # include <QImageReader>
 # include <QKeyEvent>
+# include <QMessageBox>
 #endif
 
 #include <Inventor/nodes/SoTextureCoordinateEnvironment.h>
-#include <QDialogButtonBox>
-
-#include <App/Application.h>
 
 #include "TextureMapping.h"
-#include "BitmapFactory.h"
 #include "ui_TextureMapping.h"
 #include "Application.h"
+#include "BitmapFactory.h"
 #include "Document.h"
 #include "View3DInventor.h"
 #include "View3DInventorViewer.h"
 
+
 using namespace Gui::Dialog;
 
 /* TRANSLATOR Gui::Dialog::TextureMapping */