diff --git a/src/Gui/MainWindow.h b/src/Gui/MainWindow.h
index a980f0433c..662082c515 100644
--- a/src/Gui/MainWindow.h
+++ b/src/Gui/MainWindow.h
@@ -24,15 +24,12 @@
 #ifndef GUI_MAINWINDOW_H
 #define GUI_MAINWINDOW_H
 
-#include "Window.h"
-#include <Base/Console.h>
-#include <string>
-#include <vector>
-
 #include <QEvent>
 #include <QMainWindow>
 #include <QMdiArea>
 
+#include "Window.h"
+
 class QMimeData;
 class QUrl;
 class QMdiSubWindow;
diff --git a/src/Gui/MainWindowPy.cpp b/src/Gui/MainWindowPy.cpp
index f5b1400a56..a8d97dcabc 100644
--- a/src/Gui/MainWindowPy.cpp
+++ b/src/Gui/MainWindowPy.cpp
@@ -24,15 +24,15 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <list>
-# include <sstream>
 #endif
 
+#include <Base/TypePy.h>
+
 #include "MainWindowPy.h"
 #include "MainWindow.h"
 #include "MDIView.h"
 #include "MDIViewPy.h"
 #include "PythonWrapper.h"
-#include <Base/TypePy.h>
 
 
 using namespace Gui;
diff --git a/src/Gui/SoFCSelection.cpp b/src/Gui/SoFCSelection.cpp
index 4523c96709..578c646178 100644
--- a/src/Gui/SoFCSelection.cpp
+++ b/src/Gui/SoFCSelection.cpp
@@ -23,40 +23,27 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <qstatusbar.h>
-# include <qstring.h>
+# include <QString>
 # include <Inventor/details/SoFaceDetail.h>
 # include <Inventor/details/SoLineDetail.h>
-# include <Inventor/nodes/SoCube.h>
-# include <Inventor/actions/SoGetBoundingBoxAction.h>
-# include <Inventor/nodes/SoCube.h>
 #endif
 
-#include <Inventor/elements/SoOverrideElement.h>
-#include <Inventor/elements/SoLazyElement.h>
-#include <Inventor/elements/SoCacheElement.h>
-#include <Inventor/elements/SoOverrideElement.h>
-#include <Inventor/elements/SoWindowElement.h>
-
 #include <Inventor/SoFullPath.h>
+#include <Inventor/SoPickedPoint.h>
 #include <Inventor/actions/SoGLRenderAction.h>
 #include <Inventor/actions/SoHandleEventAction.h>
+#include <Inventor/elements/SoLazyElement.h>
+#include <Inventor/elements/SoOverrideElement.h>
+#include <Inventor/elements/SoWindowElement.h>
 #include <Inventor/events/SoKeyboardEvent.h>
+#include <Inventor/events/SoLocation2Event.h>
 #include <Inventor/events/SoMouseButtonEvent.h>
 #include <Inventor/misc/SoState.h>
-#include <Inventor/misc/SoChildList.h>
-#include <Inventor/events/SoLocation2Event.h>
-#include <Inventor/SoPickedPoint.h>
 
-#include "View3DInventor.h"
-#include "View3DInventorViewer.h"
-
-#include <Base/Console.h>
 #include "SoFCSelection.h"
 #include "MainWindow.h"
-#include "Selection.h"
-#include "SoFCSelectionAction.h"
 #include "SoFCInteractiveElement.h"
+#include "SoFCSelectionAction.h"
 #include "SoFCUnifiedSelection.h"
 #include "ViewParams.h"
 
diff --git a/src/Gui/SoFCSelection.h b/src/Gui/SoFCSelection.h
index c37a5f1455..c6c8224435 100644
--- a/src/Gui/SoFCSelection.h
+++ b/src/Gui/SoFCSelection.h
@@ -35,14 +35,13 @@
 # include <GL/gl.h>
 # endif
 
-#include <Inventor/nodes/SoSubNode.h>
-#include <Inventor/nodes/SoGroup.h>
+#include <Inventor/fields/SoSFBool.h>
 #include <Inventor/fields/SoSFColor.h>
 #include <Inventor/fields/SoSFEnum.h>
 #include <Inventor/fields/SoSFString.h>
+#include <Inventor/nodes/SoGroup.h>
 #include <Inventor/nodes/SoLightModel.h>
-#include <Inventor/fields/SoSFBool.h>
-#include <memory>
+
 #include "SoFCSelectionContext.h"
 
 class SoFullPath;
diff --git a/src/Gui/SoFCSelectionAction.cpp b/src/Gui/SoFCSelectionAction.cpp
index cd07fc627b..aa4768d627 100644
--- a/src/Gui/SoFCSelectionAction.cpp
+++ b/src/Gui/SoFCSelectionAction.cpp
@@ -23,41 +23,19 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#  include <cassert>
-#  include <float.h>
 #  include <Inventor/actions/SoSearchAction.h>
 #  include <Inventor/actions/SoGetBoundingBoxAction.h>
 #  include <Inventor/nodes/SoCallback.h>
-#  include <Inventor/nodes/SoComplexity.h>
-#  include <Inventor/nodes/SoCube.h>
-#  include <Inventor/nodes/SoCamera.h>
-#  include <Inventor/nodes/SoCoordinate3.h>
-#  include <Inventor/nodes/SoCoordinate4.h>
-#  include <Inventor/nodes/SoFont.h>
 #  include <Inventor/nodes/SoMatrixTransform.h>
-#  include <Inventor/nodes/SoProfile.h>
-#  include <Inventor/nodes/SoProfileCoordinate2.h>
-#  include <Inventor/nodes/SoProfileCoordinate3.h>
 #  include <Inventor/nodes/SoSwitch.h>
-#  include <Inventor/nodes/SoTransformation.h>
 #  include <Inventor/nodes/SoIndexedLineSet.h>
 #  include <Inventor/nodes/SoIndexedFaceSet.h>
 #  include <Inventor/nodes/SoPointSet.h>
 #  include <Inventor/nodes/SoDrawStyle.h>
-#  include <Inventor/nodes/SoComplexity.h>
 #  include <Inventor/nodes/SoLightModel.h>
 #  include <Inventor/nodes/SoBaseColor.h>
 #endif
 
-#include <Base/Console.h>
-
-#include "SoFCSelectionAction.h"
-#include "SoFCSelection.h"
-#include "SoFCUnifiedSelection.h"
-#include <Inventor/bundles/SoMaterialBundle.h>
-#include <Inventor/elements/SoSwitchElement.h>
-#include "Selection.h"
-
 #include <Inventor/elements/SoComplexityElement.h>
 #include <Inventor/elements/SoComplexityTypeElement.h>
 #include <Inventor/elements/SoCoordinateElement.h>
@@ -65,30 +43,29 @@
 #include <Inventor/elements/SoFontNameElement.h>
 #include <Inventor/elements/SoFontSizeElement.h>
 #include <Inventor/elements/SoModelMatrixElement.h>
-#include <Inventor/elements/SoShapeStyleElement.h>
 #include <Inventor/elements/SoProfileCoordinateElement.h>
 #include <Inventor/elements/SoProfileElement.h>
+#include <Inventor/elements/SoShapeStyleElement.h>
 #include <Inventor/elements/SoSwitchElement.h>
 #include <Inventor/elements/SoUnitsElement.h>
-#include <Inventor/elements/SoViewVolumeElement.h>
 #include <Inventor/elements/SoViewingMatrixElement.h>
+#include <Inventor/elements/SoViewVolumeElement.h>
 #include <Inventor/elements/SoViewportRegionElement.h>
 #include <Inventor/nodes/SoCamera.h>
 #include <Inventor/nodes/SoComplexity.h>
 #include <Inventor/nodes/SoCoordinate3.h>
 #include <Inventor/nodes/SoCoordinate4.h>
 #include <Inventor/nodes/SoCube.h>
-#include <Inventor/nodes/SoFont.h>
 #include <Inventor/nodes/SoGroup.h>
-#include <Inventor/nodes/SoSeparator.h>
+#include <Inventor/nodes/SoFont.h>
 #include <Inventor/nodes/SoProfile.h>
 #include <Inventor/nodes/SoProfileCoordinate2.h>
 #include <Inventor/nodes/SoProfileCoordinate3.h>
-#include <Inventor/nodes/SoSphere.h>
+#include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoTransformation.h>
 
-
-
+#include "SoFCSelectionAction.h"
+#include "SoFCSelection.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/SoFCSelectionAction.h b/src/Gui/SoFCSelectionAction.h
index e3e8331bd0..3361f83ccf 100644
--- a/src/Gui/SoFCSelectionAction.h
+++ b/src/Gui/SoFCSelectionAction.h
@@ -24,10 +24,7 @@
 #ifndef _SoFCSelectionAction_h
 #define _SoFCSelectionAction_h
 
-//#include <Inventor/SoAction.h>
 #include <Inventor/actions/SoGLRenderAction.h>
-#include <Inventor/actions/SoSubAction.h>
-#include <Inventor/events/SoSubEvent.h>
 #include <Inventor/fields/SoSFColor.h>
 #include <Inventor/fields/SoSFString.h>
 #include <Inventor/SbColor.h>
diff --git a/src/Gui/Tree.h b/src/Gui/Tree.h
index d2b4575757..4812812a49 100644
--- a/src/Gui/Tree.h
+++ b/src/Gui/Tree.h
@@ -25,15 +25,14 @@
 #define GUI_TREE_H
 
 #include <unordered_map>
-#include <QTreeWidget>
 #include <QElapsedTimer>
 #include <QStyledItemDelegate>
+#include <QTreeWidget>
 
+#include <App/Application.h>
+#include <App/DocumentObject.h>
 #include <Base/Parameter.h>
 #include <Base/Persistence.h>
-#include <App/Document.h>
-#include <App/Application.h>
-
 #include <Gui/DockWindow.h>
 #include <Gui/Selection.h>
 
diff --git a/src/Gui/TreeView.cpp b/src/Gui/TreeView.cpp
index fb27e79d8f..8a17fe6186 100644
--- a/src/Gui/TreeView.cpp
+++ b/src/Gui/TreeView.cpp
@@ -27,11 +27,11 @@
 #endif
 
 #include "TreeView.h"
-#include "DocumentModel.h"
 #include "Application.h"
 #include "Document.h"
-#include "MDIView.h"
+#include "DocumentModel.h"
 #include "MainWindow.h"
+#include "MDIView.h"
 #include "ViewProvider.h"
 
 using namespace Gui;
diff --git a/src/Gui/TreeView.h b/src/Gui/TreeView.h
index 091d8bfc33..4150372e71 100644
--- a/src/Gui/TreeView.h
+++ b/src/Gui/TreeView.h
@@ -26,12 +26,6 @@
 
 #include <QTreeView>
 
-#include <App/Document.h>
-#include <App/Application.h>
-
-#include <Gui/DockWindow.h>
-#include <Gui/Selection.h>
-
 namespace Gui {
 
 class GuiExport TreeView : public QTreeView
diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h
index 6006df0e25..10befc8cd9 100644
--- a/src/Gui/View3DInventorViewer.h
+++ b/src/Gui/View3DInventorViewer.h
@@ -29,18 +29,18 @@
 #include <set>
 #include <vector>
 
-#include <Base/Type.h>
 #include <Base/Placement.h>
+#include <Base/Type.h>
+#include <Gui/Quarter/SoQTQuarterAdaptor.h>
+#include <Gui/Namespace.h>
+#include <Gui/Selection.h>
 #include <Inventor/nodes/SoEventCallback.h>
 #include <Inventor/nodes/SoSwitch.h>
 #include <Inventor/SbRotation.h>
-#include <Gui/Quarter/SoQTQuarterAdaptor.h>
+
 #include <QCursor>
 #include <QImage>
 
-#include <Gui/Selection.h>
-#include <Gui/Namespace.h>
-
 class SoTranslation;
 class SoTransform;
 class SoText2;
diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp
index 691a617c94..e2c9f7f65b 100644
--- a/src/Gui/View3DPy.cpp
+++ b/src/Gui/View3DPy.cpp
@@ -25,12 +25,10 @@
 
 #ifndef __InventorAll__
 # include "InventorAll.h"
-# include <sstream>
 # include <QColor>
 # include <QDir>
 # include <QFileInfo>
 # include <QImage>
-# include <Inventor/nodes/SoCamera.h>
 #endif
 
 #include <App/DocumentObject.h>
diff --git a/src/Gui/View3DPy.h b/src/Gui/View3DPy.h
index d0f94fb521..35d6ab225c 100644
--- a/src/Gui/View3DPy.h
+++ b/src/Gui/View3DPy.h
@@ -24,8 +24,6 @@
 #ifndef GUI_VIEW3DPY_H
 #define GUI_VIEW3DPY_H
 
-#include <Base/PyObjectBase.h>
-#include <CXX/Extensions.hxx>
 #include <Gui/MDIView.h>
 #include <Gui/MDIViewPy.h>