diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp
index c87b17c00d..8055c0bc44 100644
--- a/src/Gui/CommandView.cpp
+++ b/src/Gui/CommandView.cpp
@@ -25,12 +25,13 @@
 
 #ifndef _PreComp_
 # include <sstream>
-# include <Inventor/actions/SoGetBoundingBoxAction.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoOrthographicCamera.h>
 # include <Inventor/nodes/SoPerspectiveCamera.h>
 # include <QApplication>
 # include <QDialog>
+# include <QDomDocument>
+# include <QDomElement>
 # include <QFile>
 # include <QFileInfo>
 # include <QFont>
@@ -42,56 +43,43 @@
 # include <boost_bind_bind.hpp>
 #endif
 
+#include <App/ComplexGeoDataPy.h>
+#include <App/DocumentObject.h>
+#include <App/GeoFeature.h>
+#include <App/GeoFeatureGroupExtension.h>
+#include <App/MeasureDistance.h>
+#include <Base/Console.h>
+#include <Base/Parameter.h>
+
 #include "Command.h"
 #include "Action.h"
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Control.h"
 #include "Clipping.h"
-#include "FileDialog.h"
-#include "MainWindow.h"
-#include "Tree.h"
-#include "View.h"
-#include "Document.h"
-#include "Macro.h"
+#include "DemoMode.h"
 #include "DlgDisplayPropertiesImp.h"
 #include "DlgSettingsImageImp.h"
+#include "Document.h"
+#include "FileDialog.h"
+#include "Macro.h"
+#include "MainWindow.h"
+#include "NavigationStyle.h"
+#include "SceneInspector.h"
 #include "Selection.h"
-#include "SoFCOffscreenRenderer.h"
-#include "SoFCBoundingBox.h"
-#include "SoFCUnifiedSelection.h"
 #include "SoAxisCrossKit.h"
-#include "SoQTQuarterAdaptor.h"
+#include "SoFCOffscreenRenderer.h"
+#include "SoFCUnifiedSelection.h"
+#include "TextureMapping.h"
+#include "Tools.h"
+#include "Tree.h"
+#include "Utilities.h"
 #include "View3DInventor.h"
 #include "View3DInventorViewer.h"
 #include "ViewParams.h"
-#include "WaitCursor.h"
 #include "ViewProviderMeasureDistance.h"
 #include "ViewProviderGeometryObject.h"
-#include "SceneInspector.h"
-#include "DemoMode.h"
-#include "TextureMapping.h"
-#include "Tools.h"
-#include "Utilities.h"
-#include "NavigationStyle.h"
-
-#include <Base/Console.h>
-#include <Base/Tools2D.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/Reader.h>
-#include <Base/Parameter.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <App/GeoFeature.h>
-#include <App/DocumentObjectGroup.h>
-#include <App/MeasureDistance.h>
-#include <App/DocumentObject.h>
-#include <App/ComplexGeoDataPy.h>
-#include <App/GeoFeatureGroupExtension.h>
-
-#include <QDomDocument>
-#include <QDomElement>
+#include "WaitCursor.h"
 
 using namespace Gui;
 using Gui::Dialog::DlgSettingsImageImp;
diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp
index ce3e79138c..5c01f9c5bf 100644
--- a/src/Gui/Tree.cpp
+++ b/src/Gui/Tree.cpp
@@ -28,44 +28,39 @@
 # include <QAction>
 # include <QActionGroup>
 # include <QApplication>
-# include <qcursor.h>
-# include <QVBoxLayout>
-# include <qlayout.h>
-# include <qstatusbar.h>
 # include <QContextMenuEvent>
+# include <QCursor.h>
+# include <QHeaderView>
 # include <QMenu>
+# include <QMessageBox.h>
 # include <QPixmap>
 # include <QTimer>
 # include <QToolTip>
-# include <QHeaderView>
-# include <qmessagebox.h>
+# include <QVBoxLayout>
 #endif
 
 #include <Base/Console.h>
 #include <Base/Sequencer.h>
 #include <Base/Tools.h>
 
-#include <App/Document.h>
-#include <App/DocumentObject.h>
 #include <App/DocumentObjectGroup.h>
 #include <App/AutoTransaction.h>
 #include <App/GeoFeatureGroupExtension.h>
 #include <App/Link.h>
 
 #include "Tree.h"
+#include "BitmapFactory.h"
 #include "Command.h"
 #include "Document.h"
-#include "BitmapFactory.h"
-#include "ViewProviderDocumentObject.h"
-#include "MenuManager.h"
-#include "Application.h"
-#include "MainWindow.h"
-#include "View3DInventor.h"
-#include "View3DInventorViewer.h"
-#include "Macro.h"
-#include "Workbench.h"
-#include "Widgets.h"
 #include "ExpressionCompleter.h"
+#include "Macro.h"
+#include "MainWindow.h"
+#include "MenuManager.h"
+#include "View3DInventor.h"
+#include "ViewProviderDocumentObject.h"
+#include "Widgets.h"
+#include "Workbench.h"
+
 
 FC_LOG_LEVEL_INIT("Tree", false, true, true)