diff --git a/src/Gui/SceneInspector.cpp b/src/Gui/SceneInspector.cpp
index ee98a22abb..d75a25b65b 100644
--- a/src/Gui/SceneInspector.cpp
+++ b/src/Gui/SceneInspector.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Inventor/nodes/SoSeparator.h>
@@ -30,12 +29,12 @@
 
 #include "SceneInspector.h"
 #include "ui_SceneInspector.h"
+#include "Application.h"
+#include "Document.h"
 #include "View3DInventor.h"
 #include "View3DInventorViewer.h"
 #include "ViewProviderDocumentObject.h"
-#include "Document.h"
-#include "Application.h"
-#include <App/Document.h>
+
 
 using namespace Gui::Dialog;
 
diff --git a/src/Gui/SceneInspector.h b/src/Gui/SceneInspector.h
index 52661ced76..6a841af4b9 100644
--- a/src/Gui/SceneInspector.h
+++ b/src/Gui/SceneInspector.h
@@ -23,9 +23,9 @@
 #ifndef GUI_SCENEINSPECTOR_H
 #define GUI_SCENEINSPECTOR_H
 
-#include <QStandardItemModel>
 #include <QDialog>
 #include <QHash>
+#include <QStandardItemModel>
 
 class SoNode;
 
diff --git a/src/Gui/Selection.cpp b/src/Gui/Selection.cpp
index 7d48a5958e..31d5be8d84 100644
--- a/src/Gui/Selection.cpp
+++ b/src/Gui/Selection.cpp
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -49,6 +48,7 @@
 #include "Tree.h"
 #include "ViewProviderDocumentObject.h"
 
+
 FC_LOG_LEVEL_INIT("Selection",false,true,true)
 
 using namespace Gui;
diff --git a/src/Gui/Selection.h b/src/Gui/Selection.h
index c045ef3328..87209f5e3b 100644
--- a/src/Gui/Selection.h
+++ b/src/Gui/Selection.h
@@ -21,27 +21,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_SELECTION_H
 #define GUI_SELECTION_H
 
-// Std. configurations
-
+#include <deque>
+#include <list>
 #include <string>
 #include <vector>
-#include <list>
-#include <map>
-#include <deque>
-#include <boost_signals2.hpp>
 #include <CXX/Objects.hxx>
 
-#include <Base/Observer.h>
-#include <Base/Type.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/DocumentObserver.h>
+#include <Base/Observer.h>
 #include <Gui/SelectionObject.h>
 
+
 namespace App
 {
   class DocumentObject;
diff --git a/src/Gui/SelectionFilter.cpp b/src/Gui/SelectionFilter.cpp
index 5c6d26a590..b0fc87f737 100644
--- a/src/Gui/SelectionFilter.cpp
+++ b/src/Gui/SelectionFilter.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifdef __GNUC__
 # include <unistd.h>
@@ -28,17 +27,13 @@
 
 #include <sstream>
 
-#include <App/Application.h>
-#include <App/Document.h>
 #include <App/DocumentObjectPy.h>
 #include <App/DocumentObject.h>
 #include <Base/Interpreter.h>
-#include <CXX/Objects.hxx>
 
 #include "Selection.h"
 #include "SelectionFilter.h"
-//#include "SelectionFilterPy.h"
-#include "Application.h"
+
 
 using namespace Gui;
 
@@ -51,7 +46,6 @@ using namespace Gui;
 #endif
 
 
-
 SelectionFilterGate::SelectionFilterGate(const char* filter)
 {
     Filter = new SelectionFilter(filter);
diff --git a/src/Gui/SelectionObject.cpp b/src/Gui/SelectionObject.cpp
index 939045fe88..bedef25563 100644
--- a/src/Gui/SelectionObject.cpp
+++ b/src/Gui/SelectionObject.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include <sstream>
@@ -28,13 +27,13 @@
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <Base/Interpreter.h>
+#include <Gui/SelectionObjectPy.h>
 
 #include "SelectionObject.h"
 #include "Selection.h"
 #include "Application.h"
 #include "Command.h"
-#include <Gui/SelectionObjectPy.h>
+
 
 using namespace Gui;
 
diff --git a/src/Gui/SelectionObjectPyImp.cpp b/src/Gui/SelectionObjectPyImp.cpp
index 7f685dee2c..4b9f3f4915 100644
--- a/src/Gui/SelectionObjectPyImp.cpp
+++ b/src/Gui/SelectionObjectPyImp.cpp
@@ -22,17 +22,18 @@
 
 #include "PreCompiled.h"
 
-#include "SelectionObject.h"
-#include "Selection.h"
-#include <Base/GeometryPyCXX.h>
-#include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <App/Application.h>
+#include <Base/GeometryPyCXX.h>
+
+#include "Selection.h"
+#include "SelectionObject.h"
+
 
 // inclusion of the generated files (generated out of SelectionObjectPy.xml)
 #include "SelectionObjectPy.h"
 #include "SelectionObjectPy.cpp"
 
+
 using namespace Gui;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Gui/SelectionView.cpp b/src/Gui/SelectionView.cpp
index 7fb56f8e76..f7bd21dd50 100644
--- a/src/Gui/SelectionView.cpp
+++ b/src/Gui/SelectionView.cpp
@@ -20,32 +20,30 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QVBoxLayout>
+ #include <QCheckBox>
+# include <QLabel>
+# include <QLineEdit>
 # include <QListWidget>
 # include <QListWidgetItem>
-# include <QLineEdit>
+# include <QMenu>
 # include <QTextStream>
 # include <QToolButton>
- #include <QCheckBox>
-# include <QMenu>
-# include <QLabel>
+# include <QVBoxLayout>
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Console.h>
 #include <App/Document.h>
 #include <App/GeoFeature.h>
-#include "SelectionView.h"
-#include "Command.h"
-#include "Application.h"
-#include "Document.h"
-#include "ViewProvider.h"
-#include "BitmapFactory.h"
 
-FC_LOG_LEVEL_INIT("Selection",true,true,true)
+#include "SelectionView.h"
+#include "Application.h"
+#include "BitmapFactory.h"
+#include "Command.h"
+#include "Document.h"
+
+
+FC_LOG_LEVEL_INIT("Selection", true, true, true)
 
 using namespace Gui;
 using namespace Gui::DockWnd;
diff --git a/src/Gui/SelectionView.h b/src/Gui/SelectionView.h
index da72d37298..66b5aa9d16 100644
--- a/src/Gui/SelectionView.h
+++ b/src/Gui/SelectionView.h
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #ifndef GUI_DOCKWND_SELECTIONVIEW_H
 #define GUI_DOCKWND_SELECTIONVIEW_H
 
-
 #include "DockWindow.h"
 #include "Selection.h"
 
+
 class QListWidget;
 class QListWidgetItem;
 class QCheckBox;
diff --git a/src/Gui/SoAxisCrossKit.cpp b/src/Gui/SoAxisCrossKit.cpp
index 7663505ed1..17adf476e9 100644
--- a/src/Gui/SoAxisCrossKit.cpp
+++ b/src/Gui/SoAxisCrossKit.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -32,31 +31,31 @@
 # else
 # include <GL/gl.h>
 # endif
+
 # include <Inventor/actions/SoGetBoundingBoxAction.h>
 # include <Inventor/actions/SoGLRenderAction.h>
 # include <Inventor/bundles/SoMaterialBundle.h>
 # include <Inventor/bundles/SoTextureCoordinateBundle.h>
 # include <Inventor/elements/SoLazyElement.h>
+# include <Inventor/elements/SoModelMatrixElement.h>
 # include <Inventor/elements/SoViewportRegionElement.h>
 # include <Inventor/elements/SoViewVolumeElement.h>
-# include <Inventor/elements/SoModelMatrixElement.h>
+# include <Inventor/nodekits/SoShapeKit.h>
 # include <Inventor/nodes/SoBaseColor.h>
-# include <Inventor/nodes/SoShape.h>
-# include <Inventor/nodes/SoScale.h>
 # include <Inventor/nodes/SoCone.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoCube.h>
 # include <Inventor/nodes/SoFontStyle.h>
 # include <Inventor/nodes/SoLineSet.h>
+# include <Inventor/nodes/SoScale.h>
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoText2.h>
 # include <Inventor/nodes/SoTranslation.h>
-# include <Inventor/nodekits/SoShapeKit.h>
 #endif
 
-
 #include "SoAxisCrossKit.h"
 
+
 using namespace Gui;
 
 
diff --git a/src/Gui/SoAxisCrossKit.h b/src/Gui/SoAxisCrossKit.h
index c5543e66d7..4d9c8dd362 100644
--- a/src/Gui/SoAxisCrossKit.h
+++ b/src/Gui/SoAxisCrossKit.h
@@ -1,36 +1,35 @@
-/***************************************************************************
- *   Copyright (c) 2010 Werner Mayer <wmayer[at]users.sourceforge.net>     *
- *                                                                         *
- *   This file is part of the FreeCAD CAx development system.              *
- *                                                                         *
- *   This library is free software; you can redistribute it and/or         *
- *   modify it under the terms of the GNU Library General Public           *
- *   License as published by the Free Software Foundation; either          *
- *   version 2 of the License, or (at your option) any later version.      *
- *                                                                         *
- *   This library  is distributed in the hope that it will be useful,      *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU Library General Public License for more details.                  *
- *                                                                         *
- *   You should have received a copy of the GNU Library General Public     *
- *   License along with this library; see the file COPYING.LIB. If not,    *
- *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
- *   Suite 330, Boston, MA  02111-1307, USA                                *
- *                                                                         *
- ***************************************************************************/
-
-
+/***************************************************************************
+ *   Copyright (c) 2010 Werner Mayer <wmayer[at]users.sourceforge.net>     *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
 #ifndef GUI_SOSHAPESCALE_H
 #define GUI_SOSHAPESCALE_H
 
-#include <Inventor/nodekits/SoSubKit.h>
-#include <Inventor/nodekits/SoBaseKit.h>
-#include <Inventor/nodes/SoShape.h>
-#include <Inventor/fields/SoSFFloat.h>
 #include <Inventor/fields/SoSFColor.h>
+#include <Inventor/fields/SoSFFloat.h>
 #include <Inventor/fields/SoSFString.h>
 #include <Inventor/fields/SoSFVec3f.h>
+#include <Inventor/nodekits/SoBaseKit.h>
+#include <Inventor/nodes/SoShape.h>
+
 
 class SbViewport;
 class SoState;
@@ -77,7 +76,7 @@ public:
     // Overrides default method. All the parts are shapeKits,
     // so this node will not affect the state.
     virtual SbBool affectsState() const;
-    virtual void addWriteReference(SoOutput * out, SbBool isfromfield = false);
+    virtual void addWriteReference(SoOutput * out, SbBool isfromfield = false);
     virtual void getBoundingBox(SoGetBoundingBoxAction * action);
 
     static void initClass();