diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
index af833d97fa..1cf0ea2dc0 100644
--- a/src/Gui/Command.cpp
+++ b/src/Gui/Command.cpp
@@ -23,49 +23,45 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <Inventor/actions/SoGetBoundingBoxAction.h>
+# include <Inventor/nodes/SoOrthographicCamera.h>
 # include <sstream>
 # include <QApplication>
 # include <QByteArray>
 # include <QDir>
 # include <QKeySequence>
 # include <QMessageBox>
-# include <Inventor/actions/SoGetBoundingBoxAction.h>
-# include <Inventor/nodes/SoOrthographicCamera.h>
-# include <Inventor/nodes/SoPerspectiveCamera.h>
 #endif
 
 #include <boost/algorithm/string/replace.hpp>
 
-#include <Python.h>
-#include <frameobject.h>
+#include <App/DocumentObject.h>
+#include <App/AutoTransaction.h>
+#include <Base/Console.h>
+#include <Base/Exception.h>
+#include <Base/Interpreter.h>
+#include <Base/Tools.h>
+#include <Gui/ViewProviderLink.h>
 
 #include "Command.h"
 #include "Action.h"
 #include "Application.h"
+#include "BitmapFactory.h"
+#include "Control.h"
+#include "DlgUndoRedo.h"
 #include "Document.h"
-#include "Selection.h"
+#include "frameobject.h"
 #include "Macro.h"
 #include "MainWindow.h"
-#include "DlgUndoRedo.h"
-#include "BitmapFactory.h"
-#include "WhatsThis.h"
-#include "WaitCursor.h"
-#include "Control.h"
+#include "Python.h"
+#include "Selection.h"
 #include "View3DInventor.h"
 #include "View3DInventorViewer.h"
+#include "WaitCursor.h"
+#include "WhatsThis.h"
 #include "WorkbenchManager.h"
 #include "Workbench.h"
 
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Interpreter.h>
-#include <Base/Sequencer.h>
-#include <Base/Tools.h>
-
-#include <App/Document.h>
-#include <App/DocumentObject.h>
-#include <App/AutoTransaction.h>
-#include <Gui/ViewProviderLink.h>
 
 FC_LOG_LEVEL_INIT("Command", true, true)
 
diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp
index 5cd3a2357e..493edbf36a 100644
--- a/src/Gui/NaviCube.cpp
+++ b/src/Gui/NaviCube.cpp
@@ -32,91 +32,28 @@
 # else
 # include <GL/gl.h>
 # endif
-# include <Inventor/SbBox.h>
-# include <Inventor/actions/SoGetBoundingBoxAction.h>
-# include <Inventor/actions/SoGetMatrixAction.h>
-# include <Inventor/actions/SoHandleEventAction.h>
-# include <Inventor/actions/SoToVRML2Action.h>
-# include <Inventor/actions/SoWriteAction.h>
-# include <Inventor/elements/SoViewportRegionElement.h>
-# include <Inventor/manips/SoClipPlaneManip.h>
-# include <Inventor/nodes/SoBaseColor.h>
-# include <Inventor/nodes/SoCallback.h>
-# include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoCube.h>
-# include <Inventor/nodes/SoDirectionalLight.h>
-# include <Inventor/nodes/SoEventCallback.h>
-# include <Inventor/nodes/SoFaceSet.h>
-# include <Inventor/nodes/SoImage.h>
-# include <Inventor/nodes/SoIndexedFaceSet.h>
-# include <Inventor/nodes/SoLightModel.h>
-# include <Inventor/nodes/SoLocateHighlight.h>
-# include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoMaterialBinding.h>
 # include <Inventor/nodes/SoOrthographicCamera.h>
-# include <Inventor/nodes/SoPerspectiveCamera.h>
-# include <Inventor/nodes/SoRotationXYZ.h>
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoShapeHints.h>
-# include <Inventor/nodes/SoSwitch.h>
-# include <Inventor/nodes/SoTransform.h>
-# include <Inventor/nodes/SoTranslation.h>
-# include <Inventor/nodes/SoSelection.h>
-# include <Inventor/nodes/SoText2.h>
-# include <Inventor/actions/SoBoxHighlightRenderAction.h>
 # include <Inventor/events/SoEvent.h>
-# include <Inventor/events/SoKeyboardEvent.h>
 # include <Inventor/events/SoLocation2Event.h>
-# include <Inventor/events/SoMotion3Event.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
-# include <Inventor/actions/SoRayPickAction.h>
-# include <Inventor/projectors/SbSphereSheetProjector.h>
-# include <Inventor/SoOffscreenRenderer.h>
-# include <Inventor/SoPickedPoint.h>
-# include <Inventor/VRMLnodes/SoVRMLGroup.h>
-# include <QEventLoop>
-# include <QKeyEvent>
-# include <QWheelEvent>
-# include <QMessageBox>
-# include <QTimer>
-# include <QStatusBar>
-# include <QBitmap>
-# include <QMimeData>
+#include <QApplication>
+#include <QCursor>
+#include <QImage>
+#include <QMenu>
+#include <QOpenGLTexture>
+#include <QPainterPath>
 #endif
 
-#include <sstream>
-#include <Base/Console.h>
-#include <Base/Stream.h>
-#include <Base/FileInfo.h>
-#include <Base/Rotation.h>
-#include <Base/Sequencer.h>
 #include <Base/Tools.h>
-#include <Base/UnitsApi.h>
+#include <Eigen/Dense>
+
+#include "NaviCube.h"
+#include "Application.h"
+#include "Command.h"
+#include "MainWindow.h"
 
 #include "View3DInventorViewer.h"
 #include "View3DInventor.h"
-#include "Application.h"
-#include "MainWindow.h"
-#include "MDIView.h"
-#include "Command.h"
-
-#include "NaviCube.h"
-
-#include <QCursor>
-#include <QIcon>
-#include <QMenu>
-#include <QAction>
-#include <QImage>
-#include <QPainterPath>
-#include <QApplication>
-#include <QOpenGLTexture>
-
-//#include <OpenGL/glu.h>
-#include <Eigen/Dense>
-#include <vector>
-#include <map>
-#include <algorithm>
-#include <iostream>
 
 
 using namespace Eigen;
diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/NavigationStyle.cpp
index fb971292e1..a0a264f080 100644
--- a/src/Gui/NavigationStyle.cpp
+++ b/src/Gui/NavigationStyle.cpp
@@ -23,27 +23,23 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <algorithm>
-# include <cfloat>
 # include "InventorAll.h"
 # include <QAction>
 # include <QActionGroup>
 # include <QApplication>
 # include <QByteArray>
 # include <QCursor>
-# include <QList>
 # include <QMenu>
-# include <QMetaObject>
-# include <QRegExp>
 #endif
 
 #include <App/Application.h>
+
 #include "NavigationStyle.h"
-#include "View3DInventorViewer.h"
 #include "Application.h"
 #include "MenuManager.h"
 #include "MouseSelection.h"
 #include "SoMouseWheelEvent.h"
+#include "View3DInventorViewer.h"
 
 using namespace Gui;