diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp
index ad210694c1..7d02e45ecd 100644
--- a/src/Gui/Action.cpp
+++ b/src/Gui/Action.cpp
@@ -38,6 +38,7 @@
 #include <Base/Exception.h>
 #include <Base/Interpreter.h>
 #include <Base/Tools.h>
+#include <App/Document.h>
 
 #include "Action.h"
 #include "BitmapFactory.h"
diff --git a/src/Gui/ActiveObjectList.cpp b/src/Gui/ActiveObjectList.cpp
index 00e02c85b0..a31878cd96 100644
--- a/src/Gui/ActiveObjectList.cpp
+++ b/src/Gui/ActiveObjectList.cpp
@@ -24,6 +24,7 @@
 
 #include "PreCompiled.h"
 
+#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index 13546fa50d..ffe28968df 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -38,6 +38,7 @@
 #endif
 
 #include <boost/interprocess/sync/file_lock.hpp>
+#include <App/Document.h>
 #include <App/DocumentObjectPy.h>
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Gui/AutoSaver.cpp b/src/Gui/AutoSaver.cpp
index 56f5b0518e..0ce8eb2bb5 100644
--- a/src/Gui/AutoSaver.cpp
+++ b/src/Gui/AutoSaver.cpp
@@ -33,6 +33,7 @@
 #endif
 
 #include <App/Application.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
diff --git a/src/Gui/CallTips.cpp b/src/Gui/CallTips.cpp
index 630030937a..c0f802fe20 100644
--- a/src/Gui/CallTips.cpp
+++ b/src/Gui/CallTips.cpp
@@ -38,6 +38,7 @@
 #include <App/DocumentObject.h>
 #include <App/DocumentPy.h>
 #include <App/DocumentObjectPy.h>
+#include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/PyObjectBase.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
index 83c3109212..a54a1e22a2 100644
--- a/src/Gui/Command.cpp
+++ b/src/Gui/Command.cpp
@@ -35,6 +35,7 @@
 
 #include <boost/algorithm/string/replace.hpp>
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/AutoTransaction.h>
 #include <Base/Console.h>
diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp
index b0091b911a..0f5ebccfc9 100644
--- a/src/Gui/CommandDoc.cpp
+++ b/src/Gui/CommandDoc.cpp
@@ -35,6 +35,7 @@
 #include <boost/algorithm/string/replace.hpp>
 
 #include <App/AutoTransaction.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/Expression.h>
 #include <App/GeoFeature.h>
diff --git a/src/Gui/CommandFeat.cpp b/src/Gui/CommandFeat.cpp
index 727d4258eb..33c00319db 100644
--- a/src/Gui/CommandFeat.cpp
+++ b/src/Gui/CommandFeat.cpp
@@ -32,6 +32,7 @@
 #include "Document.h"
 #include "PythonConsole.h"
 #include "Selection.h"
+#include "SelectionObject.h"
 #include "ViewProvider.h"
 #include "ViewProviderDocumentObject.h"
 #include "ViewProviderLink.h"
diff --git a/src/Gui/CommandLink.cpp b/src/Gui/CommandLink.cpp
index b475216851..cd961b6377 100644
--- a/src/Gui/CommandLink.cpp
+++ b/src/Gui/CommandLink.cpp
@@ -29,6 +29,7 @@
 
 #include <App/Application.h>
 #include <App/ComplexGeoData.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/Link.h>
 #include <Base/Exception.h>
diff --git a/src/Gui/CommandStructure.cpp b/src/Gui/CommandStructure.cpp
index 4d64807efc..a00c0ed26d 100644
--- a/src/Gui/CommandStructure.cpp
+++ b/src/Gui/CommandStructure.cpp
@@ -29,6 +29,7 @@
 #include "App/Document.h"
 
 #include "Command.h"
+#include "ActiveObjectList.h"
 #include "Application.h"
 #include "Document.h"
 #include "ViewProviderDocumentObject.h"
diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp
index 8055c0bc44..912121ea78 100644
--- a/src/Gui/CommandView.cpp
+++ b/src/Gui/CommandView.cpp
@@ -44,6 +44,7 @@
 #endif
 
 #include <App/ComplexGeoDataPy.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/GeoFeature.h>
 #include <App/GeoFeatureGroupExtension.h>
@@ -67,6 +68,7 @@
 #include "NavigationStyle.h"
 #include "SceneInspector.h"
 #include "Selection.h"
+#include "SelectionObject.h"
 #include "SoAxisCrossKit.h"
 #include "SoFCOffscreenRenderer.h"
 #include "SoFCUnifiedSelection.h"
diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp
index 42c76919fb..b51750c339 100644
--- a/src/Gui/DAGView/DAGModel.cpp
+++ b/src/Gui/DAGView/DAGModel.cpp
@@ -52,6 +52,7 @@
 
 #include <Base/TimeInfo.h>
 #include <Base/Console.h>
+#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/ViewProviderDocumentObject.h>
diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index 3141fee942..8fa372d72b 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -34,6 +34,7 @@
 
 #include <App/AutoTransaction.h>
 #include <App/ComplexGeoData.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/DocumentObjectGroup.h>
 #include <App/Transactions.h>
@@ -51,6 +52,7 @@
 #include "Control.h"
 #include "FileDialog.h"
 #include "MainWindow.h"
+#include "MDIView.h"
 #include "Selection.h"
 #include "Thumbnail.h"
 #include "Tree.h"
diff --git a/src/Gui/Document.h b/src/Gui/Document.h
index 858b289dd0..91acf213bd 100644
--- a/src/Gui/Document.h
+++ b/src/Gui/Document.h
@@ -26,33 +26,38 @@
 #include <list>
 #include <map>
 #include <string>
+#include <boost_signals2.hpp>
 
-#include <App/Document.h>
 #include <Base/Persistence.h>
 
-#include "MDIView.h"
-#include "Tree.h"
-
 
 class SoNode;
 class SoPath;
+class QString;
 
 namespace Base {
 class Matrix4D;
 }
 
 namespace App {
+class Document;
+class DocumentObject;
 class DocumentObjectGroup;
+class Property;
+class Transaction;
 }
 
 namespace Gui {
 
+class BaseView;
+class MDIView;
 class ViewProvider;
 class ViewProviderDocumentObject;
 class Application;
 class DocumentPy;
 class TransactionViewProvider;
-enum  class HighlightMode;
+enum class HighlightMode;
+enum class TreeItemMode;
 
 /** The Gui Document
  *  This is the document on GUI level. Its main responsibility is keeping
diff --git a/src/Gui/DocumentModel.cpp b/src/Gui/DocumentModel.cpp
index 4684e166bb..2961d4f3c0 100644
--- a/src/Gui/DocumentModel.cpp
+++ b/src/Gui/DocumentModel.cpp
@@ -24,8 +24,10 @@
 
 #ifndef _PreComp_
 # include <QApplication>
+# include <QFont>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
 
diff --git a/src/Gui/DocumentObserver.cpp b/src/Gui/DocumentObserver.cpp
index a9f6536635..d50cf453fb 100644
--- a/src/Gui/DocumentObserver.cpp
+++ b/src/Gui/DocumentObserver.cpp
@@ -33,6 +33,7 @@
 #include "Application.h"
 #include "Document.h"
 #include "ViewProviderDocumentObject.h"
+#include <App/Document.h>
 
 
 using namespace Gui;
diff --git a/src/Gui/DocumentPyImp.cpp b/src/Gui/DocumentPyImp.cpp
index 379e9c81b0..d8987c89f9 100644
--- a/src/Gui/DocumentPyImp.cpp
+++ b/src/Gui/DocumentPyImp.cpp
@@ -33,6 +33,7 @@
 
 #include "Application.h"
 #include "MergeDocuments.h"
+#include "MDIView.h"
 #include "ViewProviderExtern.h"
 
 // inclusion of the generated files (generated out of DocumentPy.xml)
diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp
index fc7132a389..d670e56833 100644
--- a/src/Gui/DocumentRecovery.cpp
+++ b/src/Gui/DocumentRecovery.cpp
@@ -49,6 +49,7 @@
 #include <boost/interprocess/sync/file_lock.hpp>
 
 #include <App/Application.h>
+#include <App/Document.h>
 #include <Base/Exception.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
diff --git a/src/Gui/DownloadItem.cpp b/src/Gui/DownloadItem.cpp
index 8d9395a1b3..67c9d13bfe 100644
--- a/src/Gui/DownloadItem.cpp
+++ b/src/Gui/DownloadItem.cpp
@@ -21,7 +21,8 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#include <stdio.h>
+#include <cstdio>
+#include <iostream>
 
 #include <QAuthenticator>
 #include <QContextMenuEvent>
@@ -46,6 +47,7 @@
 #include "MainWindow.h"
 #include "ui_DlgAuthorization.h"
 #include "Tools.h"
+#include <App/Document.h>
 
 
 using namespace Gui::Dialog;
diff --git a/src/Gui/MDIView.cpp b/src/Gui/MDIView.cpp
index 58296b6b07..b35f9f3ce6 100644
--- a/src/Gui/MDIView.cpp
+++ b/src/Gui/MDIView.cpp
@@ -35,6 +35,7 @@
 #endif
 
 #include <Base/Interpreter.h>
+#include <App/Document.h>
 
 #include "MDIView.h"
 #include "MDIViewPy.h"
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 1c87ebb617..2778761f47 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -51,6 +51,7 @@
 #endif
 
 #include <App/Application.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/DocumentObjectGroup.h>
 #include <Base/Parameter.h>
diff --git a/src/Gui/PropertyView.cpp b/src/Gui/PropertyView.cpp
index 24ceaefafc..022ec31f24 100644
--- a/src/Gui/PropertyView.cpp
+++ b/src/Gui/PropertyView.cpp
@@ -27,6 +27,7 @@
 # include <QTimer>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Base/Parameter.h>
 
@@ -34,6 +35,7 @@
 #include "Application.h"
 #include "Document.h"
 #include "MainWindow.h"
+#include "SelectionObject.h"
 #include "Tree.h"
 #include "ViewParams.h"
 #include "ViewProvider.h"
diff --git a/src/Gui/PythonConsole.h b/src/Gui/PythonConsole.h
index 31fef0c336..bf2fa508a0 100644
--- a/src/Gui/PythonConsole.h
+++ b/src/Gui/PythonConsole.h
@@ -23,6 +23,7 @@
 #ifndef GUI_PYTHONCONSOLE_H
 #define GUI_PYTHONCONSOLE_H
 
+#include <Python.h>
 #include "PythonEditor.h"
 
 
diff --git a/src/Gui/Selection.cpp b/src/Gui/Selection.cpp
index 31d5be8d84..684ec7895e 100644
--- a/src/Gui/Selection.cpp
+++ b/src/Gui/Selection.cpp
@@ -30,6 +30,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <App/Application.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/DocumentObjectPy.h>
 #include <App/GeoFeature.h>
@@ -40,10 +41,12 @@
 #include <Base/UnitsApi.h>
 
 #include "Selection.h"
+#include "SelectionObject.h"
 #include "Application.h"
 #include "Document.h"
 #include "Macro.h"
 #include "MainWindow.h"
+#include "MDIView.h"
 #include "SelectionFilter.h"
 #include "Tree.h"
 #include "ViewProviderDocumentObject.h"
diff --git a/src/Gui/Selection.h b/src/Gui/Selection.h
index 87209f5e3b..3e2f9b4f31 100644
--- a/src/Gui/Selection.h
+++ b/src/Gui/Selection.h
@@ -30,22 +30,22 @@
 #include <vector>
 #include <CXX/Objects.hxx>
 
-#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/DocumentObserver.h>
 #include <Base/Observer.h>
-#include <Gui/SelectionObject.h>
 
 
 namespace App
 {
-  class DocumentObject;
-  class Document;
+    class DocumentObject;
+    class Document;
+    class PropertyLinkSubList;
 }
 
 namespace Gui
 {
 
+    class SelectionObject;
     class SelectionFilter;
 
 /** Transport the changes of the Selection
diff --git a/src/Gui/SelectionFilter.cpp b/src/Gui/SelectionFilter.cpp
index b0fc87f737..0e59837fcb 100644
--- a/src/Gui/SelectionFilter.cpp
+++ b/src/Gui/SelectionFilter.cpp
@@ -27,12 +27,14 @@
 
 #include <sstream>
 
+#include <App/Document.h>
 #include <App/DocumentObjectPy.h>
 #include <App/DocumentObject.h>
 #include <Base/Interpreter.h>
 
 #include "Selection.h"
 #include "SelectionFilter.h"
+#include "SelectionObject.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/SelectionObjectPyImp.cpp b/src/Gui/SelectionObjectPyImp.cpp
index 4b9f3f4915..b82b9187e9 100644
--- a/src/Gui/SelectionObjectPyImp.cpp
+++ b/src/Gui/SelectionObjectPyImp.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Base/GeometryPyCXX.h>
 
diff --git a/src/Gui/TaskCSysDragger.cpp b/src/Gui/TaskCSysDragger.cpp
index 5e95a7a995..ff8ccb9a82 100644
--- a/src/Gui/TaskCSysDragger.cpp
+++ b/src/Gui/TaskCSysDragger.cpp
@@ -28,6 +28,7 @@
 #include <QGridLayout>
 #endif
 
+#include <App/Document.h>
 #include "Document.h" // must be before TaskCSysDragger.h
 #include "TaskCSysDragger.h"
 #include "Application.h"
diff --git a/src/Gui/TaskCSysDragger.h b/src/Gui/TaskCSysDragger.h
index 4a4e6542ca..0055fce7f6 100644
--- a/src/Gui/TaskCSysDragger.h
+++ b/src/Gui/TaskCSysDragger.h
@@ -24,6 +24,7 @@
 #define TASKCSYSDRAGGER_H
 
 #include "TaskView/TaskDialog.h"
+#include <App/DocumentObserver.h>
 
 
 namespace Gui
diff --git a/src/Gui/TaskElementColors.cpp b/src/Gui/TaskElementColors.cpp
index 953abb3ba6..9092f7af7e 100644
--- a/src/Gui/TaskElementColors.cpp
+++ b/src/Gui/TaskElementColors.cpp
@@ -31,6 +31,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <App/ComplexGeoData.h>
+#include <App/Document.h>
 
 #include "TaskElementColors.h"
 #include "ui_TaskElementColors.h"
@@ -41,7 +42,7 @@
 #include "Document.h"
 #include "FileDialog.h"
 #include "Selection.h"
-
+#include "SelectionObject.h"
 #include "ViewProviderLink.h"
 
 
diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.cpp b/src/Gui/TaskView/TaskSelectLinkProperty.cpp
index c184c8fff2..a239a7acf2 100644
--- a/src/Gui/TaskView/TaskSelectLinkProperty.cpp
+++ b/src/Gui/TaskView/TaskSelectLinkProperty.cpp
@@ -22,10 +22,12 @@
 
 #include "PreCompiled.h"
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 
 #include "ui_TaskSelectLinkProperty.h"
 #include "TaskSelectLinkProperty.h"
diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp
index 7f38a391c4..11db85f9af 100644
--- a/src/Gui/Tree.cpp
+++ b/src/Gui/Tree.cpp
@@ -45,6 +45,7 @@
 #include <Base/Tools.h>
 #include <Base/Writer.h>
 
+#include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
 #include <App/AutoTransaction.h>
 #include <App/GeoFeatureGroupExtension.h>
diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp
index 6d6582cbb0..9753be881c 100644
--- a/src/Gui/View3DInventor.cpp
+++ b/src/Gui/View3DInventor.cpp
@@ -53,6 +53,7 @@
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
+#include <App/Document.h>
 
 #include "View3DInventor.h"
 #include "Application.h"
diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp
index f3e3cf5fd4..f43f5418d4 100644
--- a/src/Gui/View3DInventorViewer.cpp
+++ b/src/Gui/View3DInventorViewer.cpp
@@ -76,6 +76,7 @@
 # include <Inventor/elements/SoLightModelElement.h>
 # include <Inventor/elements/SoOverrideElement.h>
 
+#include <App/Document.h>
 #include <App/GeoFeatureGroupExtension.h>
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp
index 022c9127a2..4eb4892e6d 100644
--- a/src/Gui/View3DPy.cpp
+++ b/src/Gui/View3DPy.cpp
@@ -30,6 +30,7 @@
 # include <QImage>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/DocumentObjectPy.h>
 #include <App/GeoFeature.h>
diff --git a/src/Gui/ViewProviderAnnotation.cpp b/src/Gui/ViewProviderAnnotation.cpp
index 576e53a106..a7a9650f65 100644
--- a/src/Gui/ViewProviderAnnotation.cpp
+++ b/src/Gui/ViewProviderAnnotation.cpp
@@ -45,6 +45,7 @@
 # include <Inventor/draggers/SoTranslate2Dragger.h>
 
 #include <App/Annotation.h>
+#include <App/Document.h>
 #include <App/PropertyStandard.h>
 #include <Base/Parameter.h>
 
diff --git a/src/Gui/ViewProviderDocumentObject.cpp b/src/Gui/ViewProviderDocumentObject.cpp
index 3c95b9a27b..5fffb2fb92 100644
--- a/src/Gui/ViewProviderDocumentObject.cpp
+++ b/src/Gui/ViewProviderDocumentObject.cpp
@@ -33,6 +33,7 @@
 # include <Inventor/nodes/SoSeparator.h>
 #endif
 
+#include <App/Document.h>
 #include <App/Origin.h>
 #include <Base/Tools.h>
 
diff --git a/src/Gui/ViewProviderExtension.cpp b/src/Gui/ViewProviderExtension.cpp
index f7e9f5e2ab..1f422134df 100644
--- a/src/Gui/ViewProviderExtension.cpp
+++ b/src/Gui/ViewProviderExtension.cpp
@@ -31,6 +31,7 @@
 #include "ViewProviderExtension.h"
 #include "ViewProviderExtensionPy.h"
 #include "ViewProviderExtensionPython.h"
+#include "ViewProviderDocumentObject.h"
 
 using namespace Gui;
 
diff --git a/src/Gui/ViewProviderExtension.h b/src/Gui/ViewProviderExtension.h
index 3dd22a83ea..8ba57142ee 100644
--- a/src/Gui/ViewProviderExtension.h
+++ b/src/Gui/ViewProviderExtension.h
@@ -24,13 +24,24 @@
 #ifndef GUI_VIEWPROVIDEREXTENSION_H
 #define GUI_VIEWPROVIDEREXTENSION_H
 
+#include <QIcon>
 #include <App/Extension.h>
-#include <App/PropertyPythonObject.h>
-#include "ViewProvider.h"
-#include "ViewProviderDocumentObject.h"
+
+
+class SoDetail;
+class SoFullPath;
+class SoGroup;
+class SoPickedPoint;
+class SoSeparator;
+
+class QMenu;
+class QObject;
 
 namespace Gui {
 
+class ViewProvider;
+class ViewProviderDocumentObject;
+
 /**
  * @brief Extension with special viewprovider calls
  *
diff --git a/src/Gui/ViewProviderExtensionPyImp.cpp b/src/Gui/ViewProviderExtensionPyImp.cpp
index d5e9f30e3e..5e839881d2 100644
--- a/src/Gui/ViewProviderExtensionPyImp.cpp
+++ b/src/Gui/ViewProviderExtensionPyImp.cpp
@@ -30,6 +30,7 @@
 // inclution of the generated files (generated out of PropertyContainerPy.xml)
 #include "ViewProviderExtensionPy.h"
 #include "ViewProviderExtensionPy.cpp"
+#include "ViewProviderDocumentObject.h"
 
 using namespace Gui;
 
diff --git a/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp b/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp
index be09c2f45d..b55159861a 100644
--- a/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp
+++ b/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp
@@ -28,6 +28,7 @@
 #include <App/GeoFeatureGroupExtension.h>
 
 #include "ViewProviderGeoFeatureGroupExtension.h"
+#include "ViewProviderDocumentObject.h"
 #include "Application.h"
 #include "SoFCUnifiedSelection.h"
 
diff --git a/src/Gui/ViewProviderGroupExtension.cpp b/src/Gui/ViewProviderGroupExtension.cpp
index f21978c896..e69ef437ec 100644
--- a/src/Gui/ViewProviderGroupExtension.cpp
+++ b/src/Gui/ViewProviderGroupExtension.cpp
@@ -33,6 +33,7 @@
 #include <Base/Tools.h>
 
 #include "ViewProviderGroupExtension.h"
+#include "ViewProviderDocumentObject.h"
 #include "Command.h"
 #include "Document.h"
 #include "MainWindow.h"
diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp
index 0c70fdf07f..91214601c1 100644
--- a/src/Gui/ViewProviderLink.cpp
+++ b/src/Gui/ViewProviderLink.cpp
@@ -47,6 +47,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <App/ComplexGeoData.h>
+#include <App/Document.h>
 #include <Base/BoundBoxPy.h>
 #include <Base/MatrixPy.h>
 #include <Base/PlacementPy.h>
diff --git a/src/Gui/ViewProviderMaterialObject.cpp b/src/Gui/ViewProviderMaterialObject.cpp
index cc373d39ec..ed31857564 100644
--- a/src/Gui/ViewProviderMaterialObject.cpp
+++ b/src/Gui/ViewProviderMaterialObject.cpp
@@ -24,6 +24,7 @@
 
 #ifndef _PreComp_
 # include <QApplication>
+# include <QStyle>
 #endif
 
 #include "ViewProviderMaterialObject.h"
diff --git a/src/Gui/ViewProviderMeasureDistance.cpp b/src/Gui/ViewProviderMeasureDistance.cpp
index 72261340a7..3eba30a137 100644
--- a/src/Gui/ViewProviderMeasureDistance.cpp
+++ b/src/Gui/ViewProviderMeasureDistance.cpp
@@ -42,6 +42,7 @@
 
 #include <Inventor/MarkerBitmaps.h>
 
+#include <App/Document.h>
 #include <App/MeasureDistance.h>
 #include <Base/Console.h>
 #include <Base/Quantity.h>
diff --git a/src/Gui/ViewProviderOrigin.cpp b/src/Gui/ViewProviderOrigin.cpp
index 3908991edb..146dbfdfa7 100644
--- a/src/Gui/ViewProviderOrigin.cpp
+++ b/src/Gui/ViewProviderOrigin.cpp
@@ -27,6 +27,7 @@
 # include <Inventor/nodes/SoGroup.h>
 #endif
 
+#include <App/Document.h>
 #include <App/Origin.h>
 #include "Base/Console.h"
 #include <Base/Vector3D.h>
diff --git a/src/Gui/ViewProviderOriginGroupExtension.cpp b/src/Gui/ViewProviderOriginGroupExtension.cpp
index 3c3540b04e..e26300190d 100644
--- a/src/Gui/ViewProviderOriginGroupExtension.cpp
+++ b/src/Gui/ViewProviderOriginGroupExtension.cpp
@@ -28,6 +28,7 @@
 #include <Inventor/nodes/SoSeparator.h>
 #endif
 
+#include <App/Document.h>
 #include <App/Origin.h>
 #include <App/OriginGroupExtension.h>
 #include <Base/Console.h>
diff --git a/src/Gui/ViewProviderPart.cpp b/src/Gui/ViewProviderPart.cpp
index ba402dc3df..fc4917d5c6 100644
--- a/src/Gui/ViewProviderPart.cpp
+++ b/src/Gui/ViewProviderPart.cpp
@@ -26,6 +26,7 @@
 # include <QMenu>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/Part.h>
 
@@ -34,6 +35,7 @@
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Command.h"
+#include "MDIView.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/ViewProviderPyImp.cpp b/src/Gui/ViewProviderPyImp.cpp
index 8f406184c1..07cf3d26a7 100644
--- a/src/Gui/ViewProviderPyImp.cpp
+++ b/src/Gui/ViewProviderPyImp.cpp
@@ -26,7 +26,7 @@
 # include <Inventor/SoFullPath.h>
 # include <Inventor/details/SoDetail.h>
 # include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoSwitch.h>
+# include <Inventor/nodes/SoSwitch.h>
 # include <QByteArray>
 # include <QDataStream>
 #endif
@@ -46,6 +46,7 @@
 #include <Base/MatrixPy.h>
 #include <Base/Placement.h>
 #include <Base/PlacementPy.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/DocumentObjectPy.h>
 
diff --git a/src/Mod/Drawing/Gui/Command.cpp b/src/Mod/Drawing/Gui/Command.cpp
index 59589ca5e8..eb4885e341 100644
--- a/src/Mod/Drawing/Gui/Command.cpp
+++ b/src/Mod/Drawing/Gui/Command.cpp
@@ -23,6 +23,7 @@
 #include <vector>
 
 #include <Base/Tools.h>
+#include <App/Document.h>
 #include <App/PropertyGeo.h>
 
 #include <Gui/Action.h>
diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp
index 7abf0dddb1..9678ba2b05 100644
--- a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp
+++ b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp
@@ -30,6 +30,7 @@
 #include "TaskOrthoViews.h"
 #include "ui_TaskOrthoViews.h"
 
+#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp
index 6620d24f3a..62fedc86e4 100644
--- a/src/Mod/Fem/Gui/Command.cpp
+++ b/src/Mod/Fem/Gui/Command.cpp
@@ -47,6 +47,7 @@
 #include <Gui/FileDialog.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/Document.h>
 #include <Gui/WaitCursor.h>
 #include <Gui/View3DInventor.h>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
index 2681b21d2e..a0a8749f04 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
@@ -50,6 +50,7 @@
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Mod/Part/App/PartFeature.h>
 
 
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp
index 94e5c3d234..9cb973b81a 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp
@@ -53,6 +53,7 @@
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Mod/Part/App/PartFeature.h>
 #include <Mod/PartDesign/Gui/ReferenceSelection.h>
 
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp
index 9e64dddb45..278cc88da0 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp
@@ -47,10 +47,12 @@
 #include "TaskFemConstraintFixed.h"
 #include "ui_TaskFemConstraintFixed.h"
 #include <App/Application.h>
+#include <App/Document.h>
 #include <Base/Tools.h>
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Mod/Part/App/PartFeature.h>
 
 
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
index 17d182b96a..c810fdcec0 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
@@ -60,6 +60,7 @@
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/Command.h>
 #include <Mod/Fem/App/FemConstraintFluidBoundary.h>
 #include <Mod/Fem/App/FemMeshObject.h>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
index 014aaff8ea..215854d28a 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
@@ -58,6 +58,7 @@
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/Command.h>
 #include <Mod/Fem/App/FemConstraintForce.h>
 #include <Mod/Fem/App/FemTools.h>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
index 7a853192c4..c86daf5dbc 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
@@ -51,6 +51,7 @@
 #include <App/Application.h>
 #include <Base/Tools.h>
 #include <Gui/Command.h>
+#include <Gui/SelectionObject.h>
 #include <Mod/Part/App/PartFeature.h>
 
 using namespace FemGui;
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.cpp
index 42b5649905..5163f35f85 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.cpp
@@ -49,6 +49,7 @@
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 
 
 using namespace FemGui;
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
index 67cc747d21..e42b03bed1 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
@@ -58,6 +58,7 @@
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/Command.h>
 #include <Mod/Fem/App/FemConstraintPlaneRotation.h>
 #include <Mod/Fem/App/FemTools.h>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
index a8a7621793..5d8412ae96 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
@@ -50,6 +50,7 @@
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Mod/Part/App/PartFeature.h>
 
 
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintSpring.cpp b/src/Mod/Fem/Gui/TaskFemConstraintSpring.cpp
index 3fea6102b6..dd1f5942c5 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintSpring.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintSpring.cpp
@@ -50,6 +50,7 @@
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Mod/Part/App/PartFeature.h>
 
 
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
index 15a5672553..9073a18ad4 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
@@ -48,10 +48,12 @@
 #include "TaskFemConstraintTemperature.h"
 #include "ui_TaskFemConstraintTemperature.h"
 #include <App/Application.h>
+#include <App/Document.h>
 #include <Base/Tools.h>
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Mod/Part/App/PartFeature.h>
 
 
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
index e9092cf159..65bebe3258 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
@@ -54,6 +54,7 @@
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Mod/Part/App/PartFeature.h>
 #include <Mod/Fem/App/FemTools.h>
 
diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
index f8c173ae5f..461c92c4e5 100644
--- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp
+++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
@@ -71,6 +71,7 @@
 #include <Gui/Inventor/MarkerBitmaps.h>
 #include <Base/Console.h>
 
+#include <App/Document.h>
 #include <App/PropertyGeo.h>
 #include <App/PropertyStandard.h>
 #include <Base/Quantity.h>
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp
index 12e11e98d4..0128e80356 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp
@@ -36,6 +36,7 @@
 
 #include <Gui/Control.h>
 #include <Gui/MainWindow.h>
+#include <Gui/Selection.h>
 
 
 using namespace FemGui;
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
index 76959d7c79..3cc8c3f81a 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
@@ -63,6 +63,7 @@
 #include <Gui/Macro.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/Control.h>
+#include <App/Document.h>
 #include <App/PropertyUnits.h>
 
 #include "ui_PlaneWidget.h"
diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
index bf8e62b622..78dc4593b5 100644
--- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
+++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
@@ -33,6 +33,7 @@
 #include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
 #include <Base/UnitsApi.h>
+#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.cpp b/src/Mod/Mesh/Gui/RemeshGmsh.cpp
index f1eded902c..2ef375aba1 100644
--- a/src/Mod/Mesh/Gui/RemeshGmsh.cpp
+++ b/src/Mod/Mesh/Gui/RemeshGmsh.cpp
@@ -37,6 +37,7 @@
 #include <Base/Stream.h>
 #include <Base/Tools.h>
 #include <App/Application.h>
+#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Widgets.h>
diff --git a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp
index 62c27ee6e8..dcc32d7716 100644
--- a/src/Mod/MeshPart/Gui/CrossSections.cpp
+++ b/src/Mod/MeshPart/Gui/CrossSections.cpp
@@ -60,6 +60,7 @@
 #include <Gui/Document.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
+#include <App/Document.h>
 #include <Base/UnitsApi.h>
 
 using namespace MeshPartGui;
diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
index e46ca01d93..f14797b0b8 100644
--- a/src/Mod/Part/Gui/Command.cpp
+++ b/src/Mod/Part/Gui/Command.cpp
@@ -32,6 +32,7 @@
 # include <TopoDS_Shape.hxx>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
@@ -45,6 +46,7 @@
 #include <Gui/FileDialog.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/WaitCursor.h>
diff --git a/src/Mod/Part/Gui/CommandParametric.cpp b/src/Mod/Part/Gui/CommandParametric.cpp
index d28525fc7b..660bec3b6e 100644
--- a/src/Mod/Part/Gui/CommandParametric.cpp
+++ b/src/Mod/Part/Gui/CommandParametric.cpp
@@ -31,6 +31,7 @@
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
+#include <Gui/MDIView.h>
 
 
 //===========================================================================
diff --git a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp
index ed9d390b35..85d9d26c17 100644
--- a/src/Mod/Part/Gui/CommandSimple.cpp
+++ b/src/Mod/Part/Gui/CommandSimple.cpp
@@ -26,12 +26,14 @@
 # include <Standard_math.hxx>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Base/Exception.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/WaitCursor.h>
 
 #include "DlgPartCylinderImp.h"
diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp
index ab9adb6631..ead0e06a61 100644
--- a/src/Mod/Part/Gui/CrossSections.cpp
+++ b/src/Mod/Part/Gui/CrossSections.cpp
@@ -50,6 +50,7 @@
 #include "CrossSections.h"
 #include <Mod/Part/App/PartFeature.h>
 #include <Mod/Part/App/CrossSection.h>
+#include <App/Document.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/Application.h>
diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp
index 90bfdfffed..156e14eec5 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.cpp
+++ b/src/Mod/Part/Gui/DlgExtrusion.cpp
@@ -36,6 +36,7 @@
 #endif
 
 #include <App/Application.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Base/Interpreter.h>
 #include <Base/UnitsApi.h>
diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp
index af7f702a06..f23bdc4141 100644
--- a/src/Mod/Part/Gui/DlgFilletEdges.cpp
+++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp
@@ -70,6 +70,7 @@
 #include <Gui/WaitCursor.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/SoFCUnifiedSelection.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/Window.h>
diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
index 44e3d9e002..b7b33fe1fa 100644
--- a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
+++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
@@ -45,20 +45,22 @@
 # include <BRepPrimAPI_MakePrism.hxx>
 # include <gp_Ax1.hxx>
 # include <BRepBuilderAPI_Transform.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
 #endif
 
+#include <Inventor/SbVec3d.h>
+
 #include "DlgProjectionOnSurface.h"
 #include "ui_DlgProjectionOnSurface.h"
 
+#include <App/Document.h>
 #include <Gui/BitmapFactory.h>
-
-#include "Gui/MainWindow.h"
-#include "Gui/MDIView.h"
-#include "Gui/View3DInventor.h"
-#include "Gui/View3DInventorViewer.h"
-#include "Inventor/SbVec3d.h"
-#include "Gui/Application.h"
+#include <Gui/MainWindow.h>
+#include <Gui/MDIView.h>
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
+#include <Gui/Application.h>
+#include <Gui/SelectionObject.h>
 
 #include "ViewProviderExt.h"
 
diff --git a/src/Mod/Part/Gui/SectionCutting.cpp b/src/Mod/Part/Gui/SectionCutting.cpp
index 2b40f1fe33..6b9c28f4fb 100644
--- a/src/Mod/Part/Gui/SectionCutting.cpp
+++ b/src/Mod/Part/Gui/SectionCutting.cpp
@@ -34,6 +34,7 @@
 
 #include "SectionCutting.h"
 #include "ui_SectionCutting.h"
+#include <App/Document.h>
 #include <App/Link.h>
 #include <App/Part.h>
 #include <Base/UnitsApi.h>
diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp
index c9fac9bc05..49b1c3822f 100644
--- a/src/Mod/Part/Gui/TaskDimension.cpp
+++ b/src/Mod/Part/Gui/TaskDimension.cpp
@@ -70,6 +70,7 @@
 #include <Base/Interpreter.h>
 #include <Base/UnitsApi.h>
 #include "../App/PartFeature.h"
+#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Selection.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Part/Gui/TaskLoft.cpp b/src/Mod/Part/Gui/TaskLoft.cpp
index 0f783137a8..3f8ddcb0ac 100644
--- a/src/Mod/Part/Gui/TaskLoft.cpp
+++ b/src/Mod/Part/Gui/TaskLoft.cpp
@@ -26,6 +26,7 @@
 #ifndef _PreComp_
 # include <QMessageBox>
 # include <QTextStream>
+# include <QTreeWidget>
 # include <Precision.hxx>
 # include <ShapeAnalysis_FreeBounds.hxx>
 # include <TopoDS_Iterator.hxx>
diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.cpp b/src/Mod/Part/Gui/TaskShapeBuilder.cpp
index 8d8b8e5407..0fb1b5a3e0 100644
--- a/src/Mod/Part/Gui/TaskShapeBuilder.cpp
+++ b/src/Mod/Part/Gui/TaskShapeBuilder.cpp
@@ -43,6 +43,7 @@
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Part/Gui/TaskSweep.cpp b/src/Mod/Part/Gui/TaskSweep.cpp
index 7200a9c2e9..9c7920c2f5 100644
--- a/src/Mod/Part/Gui/TaskSweep.cpp
+++ b/src/Mod/Part/Gui/TaskSweep.cpp
@@ -28,6 +28,7 @@
 # include <QMessageBox>
 # include <QTextStream>
 # include <QTimer>
+# include <QTreeWidget>
 # include <BRepBuilderAPI_MakeWire.hxx>
 # include <Precision.hxx>
 # include <ShapeAnalysis_FreeBounds.hxx>
@@ -46,6 +47,7 @@
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 
diff --git a/src/Mod/Part/Gui/TaskThickness.cpp b/src/Mod/Part/Gui/TaskThickness.cpp
index 1237ea8b7d..dac2c1511b 100644
--- a/src/Mod/Part/Gui/TaskThickness.cpp
+++ b/src/Mod/Part/Gui/TaskThickness.cpp
@@ -37,6 +37,7 @@
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/ViewProvider.h>
 
 #include <Base/Console.h>
diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index 82b6a85149..687a5605fe 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -44,6 +44,7 @@
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Mod/Sketcher/App/SketchObject.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/FeatureGroove.h>
diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp
index 492962e503..fd39eccbb1 100644
--- a/src/Mod/PartDesign/Gui/CommandBody.cpp
+++ b/src/Mod/PartDesign/Gui/CommandBody.cpp
@@ -29,6 +29,7 @@
 # include <TopExp_Explorer.hxx>
 #endif
 
+#include <App/Document.h>
 #include <App/Origin.h>
 #include <App/Part.h>
 #include <Base/Console.h>
@@ -37,6 +38,7 @@
 #include <Gui/Document.h>
 #include <Gui/Application.h>
 #include <Gui/MainWindow.h>
+#include <Gui/MDIView.h>
 #include <Mod/Sketcher/App/SketchObject.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/FeatureBase.h>
diff --git a/src/Mod/PartDesign/Gui/ReferenceSelection.cpp b/src/Mod/PartDesign/Gui/ReferenceSelection.cpp
index c3975a9c9d..a50510c88d 100644
--- a/src/Mod/PartDesign/Gui/ReferenceSelection.cpp
+++ b/src/Mod/PartDesign/Gui/ReferenceSelection.cpp
@@ -31,6 +31,7 @@
 # include <QDialog>
 #endif
 
+#include <App/Document.h>
 #include <App/Origin.h>
 #include <App/OriginFeature.h>
 #include <App/Part.h>
diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp
index ba1a3fee3e..0f3d8f4ff2 100644
--- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp
@@ -29,6 +29,7 @@
 # include <QMessageBox>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
index b9fac71562..c6b683f6e1 100644
--- a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
@@ -31,6 +31,7 @@
 #endif
 
 #include <Base/Interpreter.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Selection.h>
 #include <Gui/Tools.h>
diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
index aa635c7775..354685355a 100644
--- a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
@@ -32,6 +32,7 @@
 #endif
 
 #include <Base/Interpreter.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp
index 354a316d61..c3d09fc3f2 100644
--- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp
@@ -33,6 +33,7 @@
 #endif
 
 #include <App/Application.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
index 1bd8a66562..349033a789 100644
--- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
@@ -28,6 +28,7 @@
 #endif
 
 #include <Base/UnitsApi.h>
+#include <App/Document.h>
 #include <Gui/Command.h>
 #include <Mod/PartDesign/App/FeatureExtrude.h>
 
diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
index 1a7344dd7b..5b79e664e2 100644
--- a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
@@ -30,6 +30,7 @@
 #endif
 
 #include <Base/Interpreter.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
index 4e78e21795..88a4b8fe35 100644
--- a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
@@ -27,6 +27,7 @@
 #ifndef _PreComp_
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/Origin.h>
 #include <Base/Console.h>
diff --git a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
index 125da44ebd..22a4713b0f 100644
--- a/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
@@ -24,6 +24,7 @@
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
+#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
index e59789554f..8f299a1277 100644
--- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
@@ -29,6 +29,7 @@
 # include <QTimer>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/Origin.h>
 #include <Base/Console.h>
diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
index 7da4f87390..6fd22a478a 100644
--- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
@@ -28,6 +28,7 @@
 # include <QMessageBox>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/Origin.h>
 #include <Base/Console.h>
diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp
index f284b32867..b66c0b8fce 100644
--- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp
@@ -27,6 +27,7 @@
 # include <QAction>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/Origin.h>
 
diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
index 5f2a272d3f..c1343c0ece 100644
--- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
@@ -27,6 +27,7 @@
 # include <QMessageBox>
 #endif
 
+#include <App/Document.h>
 #include <App/Origin.h>
 #include <Base/Console.h>
 #include <Base/UnitsApi.h>
diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
index d08c63854f..cd567757ca 100644
--- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/Origin.h>
 #include <Base/Console.h>
diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
index 2b4737b6cb..162d70cce6 100644
--- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
@@ -31,6 +31,7 @@
 #include <Base/Console.h>
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/ViewProvider.h>
 #include <Mod/PartDesign/App/FeatureScaled.h>
 
diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
index fa64f11d3a..c593f18595 100644
--- a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
+++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
@@ -27,6 +27,7 @@
 # include <QMessageBox>
 #endif
 
+#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
index 37b3ba2a74..faea5d446a 100644
--- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
@@ -30,6 +30,7 @@
 #endif
 
 #include <Base/Interpreter.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Selection.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp
index c2bd4b7352..9da299632d 100644
--- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp
@@ -27,6 +27,7 @@
 #endif
 
 #include <App/Application.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/Origin.h>
 #include <Base/Console.h>
diff --git a/src/Mod/PartDesign/Gui/ViewProvider.cpp b/src/Mod/PartDesign/Gui/ViewProvider.cpp
index dc7c2d3c9e..a09067aa35 100644
--- a/src/Mod/PartDesign/Gui/ViewProvider.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProvider.cpp
@@ -31,6 +31,7 @@
 #endif
 
 #include <Base/Exception.h>
+#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/PartDesign/Gui/ViewProviderBase.cpp b/src/Mod/PartDesign/Gui/ViewProviderBase.cpp
index d8fb296fba..345656c151 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderBase.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderBase.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 
+#include <App/Document.h>
 #include <Gui/Command.h>
 #include <Mod/PartDesign/App/FeatureBase.h>
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
index 7833de6dd5..c127053b18 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
@@ -30,6 +30,7 @@
 # include <QMenu>
 #endif
 
+#include <App/Document.h>
 #include <App/Origin.h>
 #include <App/Part.h>
 #include <Base/Console.h>
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
index c939591693..74252722f2 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
@@ -41,6 +41,7 @@
 # include <QMenu>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
index cdb4e00c9b..1b3502d42e 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
@@ -26,6 +26,7 @@
 #include "ViewProviderMultiTransform.h"
 #include "TaskMultiTransformParameters.h"
 #include <Mod/PartDesign/App/FeatureMultiTransform.h>
+#include <App/Document.h>
 #include <Gui/Command.h>
 
 using namespace PartDesignGui;
diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp
index 1d81c2fee8..2a388a01ec 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp
@@ -32,6 +32,7 @@
 #endif
 
 #include <boost/algorithm/string/predicate.hpp>
+#include <App/Document.h>
 #include <Gui/ActionFunction.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
index 184c00bf9b..b2e9c22142 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
@@ -46,6 +46,7 @@
 # include <QMenu>
 #endif
 
+#include <App/Document.h>
 #include <Base/Console.h>
 #include <Gui/Application.h>
 #include <Mod/Part/App/Tools.h>
diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index e9d1a8b8ee..fc5833425b 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 
+#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
diff --git a/src/Mod/Path/Gui/Command.cpp b/src/Mod/Path/Gui/Command.cpp
index af6bcbc266..9de013cb18 100644
--- a/src/Mod/Path/Gui/Command.cpp
+++ b/src/Mod/Path/Gui/Command.cpp
@@ -33,6 +33,7 @@
 #include <Gui/Command.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/Document.h>
 #include <Gui/Control.h>
 
diff --git a/src/Mod/Raytracing/Gui/Command.cpp b/src/Mod/Raytracing/Gui/Command.cpp
index eb9ffeb355..c46504b92a 100644
--- a/src/Mod/Raytracing/Gui/Command.cpp
+++ b/src/Mod/Raytracing/Gui/Command.cpp
@@ -57,6 +57,7 @@
 #include <Gui/View.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/FileDialog.h>
 #include <Gui/MainWindow.h>
 
diff --git a/src/Mod/Robot/Gui/Command.cpp b/src/Mod/Robot/Gui/Command.cpp
index 4b3219f939..060e95f971 100644
--- a/src/Mod/Robot/Gui/Command.cpp
+++ b/src/Mod/Robot/Gui/Command.cpp
@@ -33,6 +33,7 @@
 #include <Gui/FileDialog.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/Document.h>
 #include <Gui/Control.h>
 
diff --git a/src/Mod/Robot/Gui/TaskWatcher.cpp b/src/Mod/Robot/Gui/TaskWatcher.cpp
index 014d59efad..33c5c35856 100644
--- a/src/Mod/Robot/Gui/TaskWatcher.cpp
+++ b/src/Mod/Robot/Gui/TaskWatcher.cpp
@@ -30,6 +30,7 @@
 
 
 #include "TaskWatcher.h"
+#include <Gui/SelectionObject.h>
 
 
 using namespace RobotGui;
diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp
index e33517423d..fa5fad09f9 100644
--- a/src/Mod/Sketcher/Gui/Command.cpp
+++ b/src/Mod/Sketcher/Gui/Command.cpp
@@ -41,6 +41,7 @@
 #include <Gui/MainWindow.h>
 #include <Gui/DlgEditFileIncludePropertyExternal.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 
 #include <Mod/Sketcher/App/SketchObjectSF.h>
 #include <Mod/Sketcher/App/SketchObject.h>
diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp
index ca395b4ab8..35ce7092cc 100644
--- a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp
+++ b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp
@@ -30,6 +30,7 @@
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/CommandT.h>
 #include <Gui/MainWindow.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
index 4acdcd094f..72e98d5b0b 100644
--- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
@@ -36,6 +36,7 @@
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/CommandT.h>
 #include <Gui/MainWindow.h>
 #include <Gui/DlgEditFileIncludePropertyExternal.h>
diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp
index 302c967104..cafcee769f 100644
--- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp
+++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp
@@ -38,6 +38,7 @@
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/CommandT.h>
 #include <Gui/MainWindow.h>
 #include <Gui/DlgEditFileIncludePropertyExternal.h>
diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
index 1feb04e0a6..582bb8c529 100644
--- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
+++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
@@ -38,6 +38,7 @@
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/CommandT.h>
 #include <Gui/MainWindow.h>
 #include <Gui/DlgEditFileIncludePropertyExternal.h>
diff --git a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp
index 7f01efba9b..5311c42768 100644
--- a/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp
+++ b/src/Mod/Sketcher/Gui/CommandSketcherVirtualSpace.cpp
@@ -36,6 +36,7 @@
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/CommandT.h>
 #include <Gui/MainWindow.h>
 #include <Gui/DlgEditFileIncludePropertyExternal.h>
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
index dba467b56c..388ef3c4ec 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
@@ -52,6 +52,7 @@
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/CommandT.h>
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
index 2c41890e9d..800725646a 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
@@ -49,6 +49,7 @@
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
index c1c7177d3a..59564d891e 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -62,6 +62,7 @@
 #include <Gui/MainWindow.h>
 #include <Gui/MenuManager.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/SoFCUnifiedSelection.h>
 #include <Gui/Utilities.h>
 #include <Gui/View3DInventor.h>
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.h b/src/Mod/Sketcher/Gui/ViewProviderSketch.h
index 0e44d08b4e..d0606ab154 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h
@@ -30,6 +30,7 @@
 #include <Mod/Part/Gui/ViewProviderAttachExtension.h>
 #include <Mod/Part/App/BodyBase.h>
 #include <Base/Tools2D.h>
+#include <Base/Parameter.h>
 #include <Base/Placement.h>
 #include <Gui/Selection.h>
 #include <Gui/GLPainter.h>
diff --git a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
index fd0e01d708..14888ed014 100644
--- a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
+++ b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
@@ -37,6 +37,7 @@
 #include <Base/Exception.h>
 #include <Base/FileInfo.h>
 #include <App/Application.h>
+#include <App/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Document.h>
 #include <Gui/Application.h>
diff --git a/src/Mod/Surface/Gui/Command.cpp b/src/Mod/Surface/Gui/Command.cpp
index 705a6a822f..41beed550e 100644
--- a/src/Mod/Surface/Gui/Command.cpp
+++ b/src/Mod/Surface/Gui/Command.cpp
@@ -54,6 +54,7 @@
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/WaitCursor.h>
diff --git a/src/Mod/Surface/Gui/TaskFilling.cpp b/src/Mod/Surface/Gui/TaskFilling.cpp
index bc25c3a0b7..ee21ce2bd3 100644
--- a/src/Mod/Surface/Gui/TaskFilling.cpp
+++ b/src/Mod/Surface/Gui/TaskFilling.cpp
@@ -31,12 +31,13 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+#include <Base/Console.h>
+#include <App/Document.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Command.h>
 #include <Gui/SelectionObject.h>
-#include <Base/Console.h>
 #include <Gui/Control.h>
 #include <Gui/BitmapFactory.h>
 #include <Mod/Part/Gui/ViewProvider.h>
diff --git a/src/Mod/Surface/Gui/TaskFillingEdge.cpp b/src/Mod/Surface/Gui/TaskFillingEdge.cpp
index f0bb1f71d2..1955892770 100644
--- a/src/Mod/Surface/Gui/TaskFillingEdge.cpp
+++ b/src/Mod/Surface/Gui/TaskFillingEdge.cpp
@@ -32,6 +32,7 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+#include <App/Document.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Surface/Gui/TaskFillingVertex.cpp b/src/Mod/Surface/Gui/TaskFillingVertex.cpp
index 4bfa3a6be6..371187c54d 100644
--- a/src/Mod/Surface/Gui/TaskFillingVertex.cpp
+++ b/src/Mod/Surface/Gui/TaskFillingVertex.cpp
@@ -31,6 +31,7 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+#include <App/Document.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp b/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp
index 7ec3be91d6..d36d2d3c8c 100644
--- a/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp
+++ b/src/Mod/Surface/Gui/TaskGeomFillSurface.cpp
@@ -29,6 +29,7 @@
 #include <TopExp.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
+#include <App/Document.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/Surface/Gui/TaskSections.cpp b/src/Mod/Surface/Gui/TaskSections.cpp
index eda3824d32..6eef1858fd 100644
--- a/src/Mod/Surface/Gui/TaskSections.cpp
+++ b/src/Mod/Surface/Gui/TaskSections.cpp
@@ -31,6 +31,7 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+#include <App/Document.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index f66a74f6a3..4b1bdbc722 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -64,6 +64,7 @@
 #include <Gui/FileDialog.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 
diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
index 107c738fc6..004ab4a960 100644
--- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
@@ -31,6 +31,7 @@
 # include <exception>
 #endif  //#ifndef _PreComp_
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Action.h>
 #include <Gui/Application.h>
@@ -39,6 +40,7 @@
 #include <Gui/Control.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/MainWindow.h>
 #include <Gui/FileDialog.h>
 #include <Gui/ViewProvider.h>
diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
index 98914fe7c8..fc7ab8b4b2 100644
--- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
@@ -32,20 +32,22 @@
 
 #include <QGraphicsView>
 
-# include <App/DocumentObject.h>
-# include <Base/Exception.h>
+#include <App/Document.h>
+#include <App/DocumentObject.h>
+#include <Base/Exception.h>
 #include <Base/Console.h>
 #include <Base/Type.h>
-# include <Gui/Action.h>
-# include <Gui/Application.h>
-# include <Gui/BitmapFactory.h>
-# include <Gui/Command.h>
-# include <Gui/Control.h>
-# include <Gui/Document.h>
-# include <Gui/Selection.h>
-# include <Gui/MainWindow.h>
-# include <Gui/FileDialog.h>
-# include <Gui/ViewProvider.h>
+#include <Gui/Action.h>
+#include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
+#include <Gui/Control.h>
+#include <Gui/Document.h>
+#include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
+#include <Gui/MainWindow.h>
+#include <Gui/FileDialog.h>
+#include <Gui/ViewProvider.h>
 
 # include <Mod/Part/App/PartFeature.h>
 
diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
index 7dabfb89c8..a3babadf23 100644
--- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
@@ -32,18 +32,20 @@
 
 #include <QGraphicsView>
 
-# include <Base/Tools.h>
-# include <App/DocumentObject.h>
-# include <Gui/Action.h>
-# include <Gui/Application.h>
-# include <Gui/BitmapFactory.h>
-# include <Gui/Command.h>
-# include <Gui/Control.h>
-# include <Gui/Document.h>
-# include <Gui/Selection.h>
-# include <Gui/MainWindow.h>
-# include <Gui/FileDialog.h>
-# include <Gui/ViewProvider.h>
+#include <Base/Tools.h>
+#include <App/Document.h>
+#include <App/DocumentObject.h>
+#include <Gui/Action.h>
+#include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
+#include <Gui/Control.h>
+#include <Gui/Document.h>
+#include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
+#include <Gui/MainWindow.h>
+#include <Gui/FileDialog.h>
+#include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 
 # include <Mod/Part/App/PartFeature.h>
diff --git a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
index 7a607fee71..f17658bb5e 100644
--- a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
@@ -28,6 +28,7 @@
 # include <sstream>
 #endif  //#ifndef _PreComp_
 
+# include <App/Document.h>
 # include <App/DocumentObject.h>
 # include <Base/Console.h>
 # include <Base/Type.h>
@@ -38,6 +39,7 @@
 # include <Gui/Control.h>
 # include <Gui/MainWindow.h>
 # include <Gui/Selection.h>
+# include <Gui/SelectionObject.h>
 
 # include <Mod/TechDraw/App/DrawViewBalloon.h>
 # include <Mod/TechDraw/App/DrawViewDimension.h>
diff --git a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
index 637e3efc47..33a21b82d3 100644
--- a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
+++ b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
@@ -30,6 +30,7 @@
 # include <exception>
 #endif  //#ifndef _PreComp_
 
+# include <App/Document.h>
 # include <App/DocumentObject.h>
 # include <Base/Exception.h>
 # include <Base/Console.h>
@@ -42,6 +43,7 @@
 # include <Gui/Control.h>
 # include <Gui/Document.h>
 # include <Gui/Selection.h>
+# include <Gui/SelectionObject.h>
 # include <Gui/MainWindow.h>
 # include <Gui/FileDialog.h>
 # include <Gui/ViewProvider.h>
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
index 3598916c23..7861939ab2 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -67,6 +67,7 @@
 #include <Gui/Window.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 
 #include <Mod/TechDraw/App/DrawHatch.h>
 #include <Mod/TechDraw/App/DrawPage.h>
diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
index c0d14d5468..9922aa593c 100644
--- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
@@ -35,6 +35,8 @@
 #include <Base/Tools.h>
 #include <Base/UnitsApi.h>
 
+#include <App/Document.h>
+
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/TechDraw/Gui/TaskDetail.cpp b/src/Mod/TechDraw/Gui/TaskDetail.cpp
index 022e1869c3..526872c06e 100644
--- a/src/Mod/TechDraw/Gui/TaskDetail.cpp
+++ b/src/Mod/TechDraw/Gui/TaskDetail.cpp
@@ -32,6 +32,8 @@
 #include <Base/Quantity.h>
 #include <Base/UnitsApi.h>
 
+#include <App/Document.h>
+
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/TechDraw/Gui/TaskDimension.cpp b/src/Mod/TechDraw/Gui/TaskDimension.cpp
index 7cd8cb6e40..0879234b45 100644
--- a/src/Mod/TechDraw/Gui/TaskDimension.cpp
+++ b/src/Mod/TechDraw/Gui/TaskDimension.cpp
@@ -36,6 +36,7 @@
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
 #include <Gui/ViewProvider.h>
 
 #include <App/Application.h>
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
index 3fb328c5cf..c5cdf0dc3c 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
@@ -32,6 +32,8 @@
 #include <Base/Console.h>
 #include <Base/Tools.h>
 
+#include <App/Document.h>
+
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp
index 6f398c262e..dcee281d8b 100644
--- a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp
@@ -24,6 +24,7 @@
 
 #ifndef _PreComp_
 #include <cmath>
+#include <QTreeWidget>
 #endif // #ifndef _PreComp_
 
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
index 9f43c16811..367ccc08a2 100644
--- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
@@ -33,6 +33,8 @@
 #include <Base/Console.h>
 #include <Base/Tools.h>
 
+#include <App/Document.h>
+
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
index be9acda7df..ced63629cf 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
@@ -37,6 +37,8 @@
 #include <Base/Tools.h>
 #include <Base/UnitsApi.h>
 
+#include <App/Document.h>
+
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
index 04f51c6fea..da206ae7e8 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
@@ -36,6 +36,7 @@
 # include <boost/signals2/connection.hpp>
 #endif
 
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
 #include <Gui/Application.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
index 4cfb70345c..233935f8d4 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp
@@ -31,6 +31,7 @@
 #endif
 
 #include <App/Application.h>
+#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Base/Parameter.h>
 #include <Gui/Control.h>
diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp
index 13e2c357ff..59c7124f7f 100644
--- a/src/Mod/Web/Gui/BrowserView.cpp
+++ b/src/Mod/Web/Gui/BrowserView.cpp
@@ -87,6 +87,7 @@ using QWebEnginePage = QWebPage;
 #include <Base/Parameter.h>
 #include <Base/Exception.h>
 #include <Base/Tools.h>
+#include <App/Document.h>
 #include <CXX/Extensions.hxx>
 
 using namespace WebGui;