diff --git a/src/Gui/GLPainter.cpp b/src/Gui/GLPainter.cpp
index 63da5aa790..ee4171e167 100644
--- a/src/Gui/GLPainter.cpp
+++ b/src/Gui/GLPainter.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -28,7 +27,7 @@
 
 #include "GLPainter.h"
 #include "View3DInventorViewer.h"
-#include <Base/Console.h>
+
 
 using namespace Gui;
 
diff --git a/src/Gui/GraphicsViewZoom.cpp b/src/Gui/GraphicsViewZoom.cpp
index 86e112fcf1..1981a88515 100644
--- a/src/Gui/GraphicsViewZoom.cpp
+++ b/src/Gui/GraphicsViewZoom.cpp
@@ -32,10 +32,9 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <QApplication>
 # include <QGraphicsView>
 # include <QMouseEvent>
-# include <QApplication>
-# include <QScrollBar>
 # include <qmath.h>
 #endif
 
diff --git a/src/Gui/GraphicsViewZoom.h b/src/Gui/GraphicsViewZoom.h
index 3db2259131..1c6612ddfd 100644
--- a/src/Gui/GraphicsViewZoom.h
+++ b/src/Gui/GraphicsViewZoom.h
@@ -37,7 +37,6 @@
 #include <QPointF>
 
 
-
 /*!
  * This class adds ability to zoom QGraphicsView using mouse wheel. The point under cursor
  * remains motionless while it's possible.
diff --git a/src/Gui/GraphvizView.cpp b/src/Gui/GraphvizView.cpp
index bb27280eb9..994182b21a 100644
--- a/src/Gui/GraphvizView.cpp
+++ b/src/Gui/GraphvizView.cpp
@@ -20,37 +20,34 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <QApplication>
 # include <QFile>
+# include <QGraphicsScene>
+# include <QGraphicsSvgItem>
+# include <QGraphicsView>
+# include <QMessageBox>
+# include <QMouseEvent>
 # include <QPrinter>
 # include <QPrintDialog>
 # include <QPrintPreviewDialog>
 # include <QProcess>
 # include <QSvgRenderer>
-# include <QGraphicsSvgItem>
-# include <QMessageBox>
-# include <QMouseEvent>
-# include <QGraphicsScene>
-# include <QGraphicsView>
 # include <QScrollBar>
 # include <QThread>
-# include <QProcess>
-# include <boost_bind_bind.hpp>
 #endif
-#include "GraphicsViewZoom.h"
-#include "FileDialog.h"
 
-
-#include "GraphvizView.h"
-#include "Application.h"
-#include "MainWindow.h"
 #include <App/Application.h>
 #include <App/Document.h>
 
+#include "GraphvizView.h"
+#include "GraphicsViewZoom.h"
+#include "FileDialog.h"
+#include "MainWindow.h"
+
+
 using namespace Gui;
 namespace bp = boost::placeholders;
 
diff --git a/src/Gui/GraphvizView.h b/src/Gui/GraphvizView.h
index 0f4840bbd0..804a84d91f 100644
--- a/src/Gui/GraphvizView.h
+++ b/src/Gui/GraphvizView.h
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_GRAPHVIZVIEW_H
 #define GUI_GRAPHVIZVIEW_H
 
 #include "MDIView.h"
-#include <boost_signals2.hpp>
 
 
 class QGraphicsScene;
diff --git a/src/Gui/GuiApplicationNativeEventAware.h b/src/Gui/GuiApplicationNativeEventAware.h
index 499aab5112..b1d18b14b0 100644
--- a/src/Gui/GuiApplicationNativeEventAware.h
+++ b/src/Gui/GuiApplicationNativeEventAware.h
@@ -20,14 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #ifndef GUIAPPLICATIONNATIVEEVENTAWARE_H
 #define GUIAPPLICATIONNATIVEEVENTAWARE_H
 
 #include <QApplication>
 #include <vector>
 
+
 class QMainWindow;
 
 namespace Gui