From b360b43ebef91d641f4688995094ae58025909b2 Mon Sep 17 00:00:00 2001
From: AgCaliva <ramiel1390@gmail.com>
Date: Sat, 16 Sep 2023 00:38:41 -0300
Subject: [PATCH] Fixing DOMDocument redefinition

---
 src/Gui/PreferencePages/DlgSettingsNavigation.cpp | 5 +++--
 src/Gui/TaskView/TaskImage.cpp                    | 5 +++--
 src/Mod/Fem/Gui/TaskCreateNodeSet.cpp             | 4 ++--
 src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp   | 5 +++--
 src/Mod/Mesh/Gui/Command.cpp                      | 4 ++--
 src/Mod/Mesh/Gui/MeshEditor.cpp                   | 5 +++--
 src/Mod/Mesh/Gui/MeshSelection.cpp                | 5 ++---
 src/Mod/MeshPart/Gui/Command.cpp                  | 5 ++---
 src/Mod/MeshPart/Gui/CrossSections.cpp            | 5 ++---
 src/Mod/MeshPart/Gui/CurveOnMesh.cpp              | 5 ++---
 src/Mod/Part/Gui/BoxSelection.cpp                 | 5 ++---
 src/Mod/Part/Gui/Command.cpp                      | 5 ++---
 src/Mod/Part/Gui/CrossSections.cpp                | 5 ++---
 src/Mod/Part/Gui/DlgPrimitives.cpp                | 5 ++---
 src/Mod/Part/Gui/DlgProjectionOnSurface.cpp       | 5 ++---
 src/Mod/Part/Gui/SectionCutting.cpp               | 5 ++---
 src/Mod/Part/Gui/TaskDimension.cpp                | 5 ++---
 src/Mod/Part/Gui/TaskFaceColors.cpp               | 5 ++---
 src/Mod/PartDesign/Gui/ViewProviderBody.cpp       | 5 ++---
 src/Mod/PartDesign/Gui/ViewProviderDatum.cpp      | 5 ++---
 src/Mod/Sandbox/Gui/AppSandboxGui.cpp             | 5 ++---
 src/Mod/Sandbox/Gui/Command.cpp                   | 5 ++---
 src/Mod/Sandbox/Gui/Overlay.cpp                   | 9 +++------
 src/Mod/Sketcher/Gui/CommandCreateGeo.cpp         | 5 ++---
 src/Mod/Sketcher/Gui/DrawSketchHandler.cpp        | 5 ++---
 src/Mod/Sketcher/Gui/EditDatumDialog.cpp          | 5 ++---
 src/Mod/Sketcher/Gui/ViewProviderSketch.cpp       | 5 ++---
 src/Mod/TechDraw/Gui/DrawGuiUtil.cpp              | 5 ++---
 src/Mod/TechDraw/Gui/Grabber3d.cpp                | 5 ++---
 src/Mod/TechDraw/Gui/QGVPage.cpp                  | 5 ++---
 src/Mod/TechDraw/Gui/TaskProjection.cpp           | 5 ++---
 31 files changed, 67 insertions(+), 90 deletions(-)

diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.cpp b/src/Gui/PreferencePages/DlgSettingsNavigation.cpp
index ee65c0d091..7312137176 100644
--- a/src/Gui/PreferencePages/DlgSettingsNavigation.cpp
+++ b/src/Gui/PreferencePages/DlgSettingsNavigation.cpp
@@ -28,6 +28,8 @@
 # include <QGridLayout>
 # include <memory>
 #endif
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 
 #include <App/Application.h>
 #include <Base/Parameter.h>
@@ -35,8 +37,7 @@
 #include <Gui/MainWindow.h>
 #include <Gui/View3DSettings.h>
 #include <Gui/NavigationStyle.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
+
 
 #include "DlgSettingsNavigation.h"
 #include "ui_DlgSettingsNavigation.h"
diff --git a/src/Gui/TaskView/TaskImage.cpp b/src/Gui/TaskView/TaskImage.cpp
index a93aaf9440..48038c9f26 100644
--- a/src/Gui/TaskView/TaskImage.cpp
+++ b/src/Gui/TaskView/TaskImage.cpp
@@ -41,6 +41,8 @@
 # include <Inventor/nodes/SoAnnotation.h>
 # include <Inventor/nodes/SoTransform.h>
 #endif
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 
 #include <Base/Console.h>
 #include <Base/Precision.h>
@@ -52,8 +54,7 @@
 #include <Gui/Camera.h>
 #include <Gui/Document.h>
 #include <Gui/SoDatumLabel.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
+
 #include <Gui/ViewProviderDocumentObject.h>
 #include <Gui/TaskView/TaskView.h>
 
diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
index 650d7aaeba..56459bbeaf 100644
--- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
+++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
@@ -30,14 +30,14 @@
 # include <SMESHDS_Mesh.hxx>
 # include <Standard_math.hxx>
 #endif
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 
 #include <Base/Console.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Document.h>
 #include <Gui/Utilities.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 #include <Mod/Fem/App/FemMeshObject.h>
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
index bd195196f9..05f7634b80 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
@@ -42,6 +42,8 @@
 # include <QMessageBox>
 # include <QTextStream>
 #endif
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 
 #include <App/Document.h>
 #include <Base/UnitsApi.h>
@@ -49,8 +51,7 @@
 #include <Gui/Control.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
+
 #include <Gui/TaskView/TaskDialog.h>
 
 #include "ViewProviderFemPostFunction.h"
diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp
index 47ce40302e..2efee094db 100644
--- a/src/Mod/Mesh/Gui/Command.cpp
+++ b/src/Mod/Mesh/Gui/Command.cpp
@@ -38,6 +38,8 @@
 #ifndef __InventorAll__
 # include <Gui/InventorAll.h>
 #endif
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 
 #include <App/DocumentObjectGroup.h>
 #include <App/DocumentObject.h>
@@ -53,8 +55,6 @@
 #include <Gui/MouseSelection.h>
 #include <Gui/NavigationStyle.h>
 #include <Gui/Selection.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/WaitCursor.h>
 
 #include <Mod/Mesh/App/FeatureMeshCurvature.h>
diff --git a/src/Mod/Mesh/Gui/MeshEditor.cpp b/src/Mod/Mesh/Gui/MeshEditor.cpp
index e15df12cc4..0d87575b21 100644
--- a/src/Mod/Mesh/Gui/MeshEditor.cpp
+++ b/src/Mod/Mesh/Gui/MeshEditor.cpp
@@ -45,11 +45,12 @@
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoShapeHints.h>
 #endif
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 
 #include <App/Application.h>
 #include <App/Document.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
+
 #include <Gui/WaitCursor.h>
 #include <Mod/Mesh/App/MeshFeature.h>
 #include <Mod/Mesh/App/Core/Algorithm.h>
diff --git a/src/Mod/Mesh/Gui/MeshSelection.cpp b/src/Mod/Mesh/Gui/MeshSelection.cpp
index eb464ffe2b..18be15611c 100644
--- a/src/Mod/Mesh/Gui/MeshSelection.cpp
+++ b/src/Mod/Mesh/Gui/MeshSelection.cpp
@@ -32,7 +32,8 @@
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoCamera.h>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <Base/Console.h>
@@ -42,8 +43,6 @@
 #include <Gui/MouseSelection.h>
 #include <Gui/NavigationStyle.h>
 #include <Gui/Utilities.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Mod/Mesh/App/MeshFeature.h>
 #include <Mod/Mesh/App/Core/MeshKernel.h>
 #include <Mod/Mesh/App/Core/Iterator.h>
diff --git a/src/Mod/MeshPart/Gui/Command.cpp b/src/Mod/MeshPart/Gui/Command.cpp
index 4da4af0e89..4dfb6994fc 100644
--- a/src/Mod/MeshPart/Gui/Command.cpp
+++ b/src/Mod/MeshPart/Gui/Command.cpp
@@ -26,7 +26,8 @@
 # include <QMessageBox>
 # include <QPushButton>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <Base/Converter.h>
@@ -35,8 +36,6 @@
 #include <Gui/Control.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Mod/Mesh/App/MeshFeature.h>
 
 #include "CrossSections.h"
diff --git a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp
index 6e4cf1015a..f76099a050 100644
--- a/src/Mod/MeshPart/Gui/CrossSections.cpp
+++ b/src/Mod/MeshPart/Gui/CrossSections.cpp
@@ -41,15 +41,14 @@
 # include <Inventor/nodes/SoLineSet.h>
 # include <Inventor/nodes/SoSeparator.h>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
 #include <Gui/ViewProvider.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Mod/Mesh/App/MeshFeature.h>
 #include <Mod/Part/App/PartFeature.h>
 #include <Mod/Part/App/Tools.h>
diff --git a/src/Mod/MeshPart/Gui/CurveOnMesh.cpp b/src/Mod/MeshPart/Gui/CurveOnMesh.cpp
index be26d5474e..00e62a10cc 100644
--- a/src/Mod/MeshPart/Gui/CurveOnMesh.cpp
+++ b/src/Mod/MeshPart/Gui/CurveOnMesh.cpp
@@ -50,14 +50,13 @@
 # include <Inventor/nodes/SoPointSet.h>
 # include <Inventor/nodes/SoSeparator.h>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <Base/Converter.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Utilities.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Mod/Mesh/App/MeshFeature.h>
 #include <Mod/Mesh/App/Core/Algorithm.h>
 #include <Mod/Mesh/App/Core/Grid.h>
diff --git a/src/Mod/Part/Gui/BoxSelection.cpp b/src/Mod/Part/Gui/BoxSelection.cpp
index 9a18d68d31..cc9215ed97 100644
--- a/src/Mod/Part/Gui/BoxSelection.cpp
+++ b/src/Mod/Part/Gui/BoxSelection.cpp
@@ -33,7 +33,8 @@
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoCamera.h>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Application.h>
@@ -41,8 +42,6 @@
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
 #include <Gui/Utilities.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 
 #include "BoxSelection.h"
 #include "ViewProviderExt.h"
diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
index 983045064f..128215678e 100644
--- a/src/Mod/Part/Gui/Command.cpp
+++ b/src/Mod/Part/Gui/Command.cpp
@@ -31,7 +31,8 @@
 # include <TopExp_Explorer.hxx>
 # include <TopoDS_Shape.hxx>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
 #include <Base/Console.h>
@@ -48,8 +49,6 @@
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionObject.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/WaitCursor.h>
 
 #include "BoxSelection.h"
diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp
index 76069d3282..f1144e9115 100644
--- a/src/Mod/Part/Gui/CrossSections.cpp
+++ b/src/Mod/Part/Gui/CrossSections.cpp
@@ -38,7 +38,8 @@
 # include <Inventor/nodes/SoLineSet.h>
 # include <Inventor/nodes/SoSeparator.h>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <Base/Sequencer.h>
 #include <Base/UnitsApi.h>
@@ -46,8 +47,6 @@
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/ViewProvider.h>
 #include <Mod/Part/App/CrossSection.h>
 #include <Mod/Part/App/PartFeature.h>
diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp
index 0d6d1c525a..9ac0dc2d86 100644
--- a/src/Mod/Part/Gui/DlgPrimitives.cpp
+++ b/src/Mod/Part/Gui/DlgPrimitives.cpp
@@ -33,7 +33,8 @@
 #include <Inventor/SoPickedPoint.h>
 #include <Inventor/events/SoMouseButtonEvent.h>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Application.h>
 #include <App/Part.h>
 #include <App/Document.h>
@@ -43,8 +44,6 @@
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Command.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/SoFCUnifiedSelection.h>
 #include <Gui/TaskView/TaskView.h>
 #include <Mod/Part/App/PrimitiveFeature.h>
diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
index 4d0704f981..48dbec94ce 100644
--- a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
+++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
@@ -42,12 +42,11 @@
 # include <TopoDS_Edge.hxx>
 # include <TopoDS_Face.hxx>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/Application.h>
 #include <Gui/SelectionObject.h>
 #include <Inventor/SbVec3d.h>
diff --git a/src/Mod/Part/Gui/SectionCutting.cpp b/src/Mod/Part/Gui/SectionCutting.cpp
index ddf2c15b7d..8fa4a41534 100644
--- a/src/Mod/Part/Gui/SectionCutting.cpp
+++ b/src/Mod/Part/Gui/SectionCutting.cpp
@@ -38,7 +38,8 @@
 # include <QSlider>
 # include <QToolTip>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <App/Link.h>
 #include <App/Part.h>
@@ -50,8 +51,6 @@
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/PrefWidgets.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/ViewProviderGeometryObject.h>
 #include <Mod/Part/App/FeatureCompound.h>
 #include <Mod/Part/App/FeaturePartBox.h>
diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp
index a733465e24..b916f05168 100644
--- a/src/Mod/Part/Gui/TaskDimension.cpp
+++ b/src/Mod/Part/Gui/TaskDimension.cpp
@@ -62,7 +62,8 @@
 # include <Inventor/nodes/SoTransform.h>
 # include <Inventor/nodes/SoVertexProperty.h>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
@@ -72,8 +73,6 @@
 #include <Gui/BitmapFactory.h>
 #include <Gui/Control.h>
 #include <Gui/Selection.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Mod/Part/App/PartFeature.h>
 
 #include "TaskDimension.h"
diff --git a/src/Mod/Part/Gui/TaskFaceColors.cpp b/src/Mod/Part/Gui/TaskFaceColors.cpp
index 0b088f898a..84a71e1740 100644
--- a/src/Mod/Part/Gui/TaskFaceColors.cpp
+++ b/src/Mod/Part/Gui/TaskFaceColors.cpp
@@ -42,7 +42,8 @@
 # include <Inventor/nodes/SoCamera.h>
 # include <Inventor/nodes/SoSeparator.h>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Control.h>
@@ -51,8 +52,6 @@
 #include <Gui/Selection.h>
 #include <Gui/Tools.h>
 #include <Gui/Utilities.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 
 #include "TaskFaceColors.h"
 #include "ui_TaskFaceColors.h"
diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
index 19313c0003..ed06ec5b4d 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
@@ -29,7 +29,8 @@
 # include <Precision.hxx>
 # include <QMenu>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <App/Origin.h>
 #include <App/Part.h>
@@ -39,8 +40,6 @@
 #include <Gui/Command.h>
 #include <Gui/Document.h>
 #include <Gui/MDIView.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/ViewProviderOrigin.h>
 #include <Gui/ViewProviderOriginFeature.h>
 #include <Mod/PartDesign/App/Body.h>
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
index 7c84e38206..2d0e2fda58 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
@@ -40,14 +40,13 @@
 # include <QAction>
 # include <QMenu>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/ViewProviderOrigin.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/DatumCS.h>
diff --git a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp
index 14664b6ae9..b2ce5434fa 100644
--- a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp
+++ b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp
@@ -30,7 +30,8 @@
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/GeometryPyCXX.h>
@@ -42,8 +43,6 @@
 #include <App/Document.h>
 #include <App/DocumentObserver.h>
 #include <Gui/Document.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/Application.h>
 #ifdef HAVE_PART
 #include <Mod/Part/App/PropertyGeometryList.h>
diff --git a/src/Mod/Sandbox/Gui/Command.cpp b/src/Mod/Sandbox/Gui/Command.cpp
index 0f034ec871..b7a0ad6f9d 100644
--- a/src/Mod/Sandbox/Gui/Command.cpp
+++ b/src/Mod/Sandbox/Gui/Command.cpp
@@ -58,7 +58,8 @@
 # include <boost/bind/bind.hpp>
 # include <memory>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <Base/Console.h>
 #include <Base/Sequencer.h>
 #include <App/Application.h>
@@ -68,8 +69,6 @@
 #include <Gui/Command.h>
 #include <Gui/MainWindow.h>
 #include <Gui/FileDialog.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Gui/WaitCursor.h>
 
 #include <Mod/Sandbox/App/DocumentThread.h>
diff --git a/src/Mod/Sandbox/Gui/Overlay.cpp b/src/Mod/Sandbox/Gui/Overlay.cpp
index e7fa9e8f7c..aa8674dfc6 100644
--- a/src/Mod/Sandbox/Gui/Overlay.cpp
+++ b/src/Mod/Sandbox/Gui/Overlay.cpp
@@ -29,6 +29,8 @@
 # include <Inventor/nodes/SoOrthographicCamera.h>
 # include <Inventor/nodes/SoImage.h>
 #endif
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 
 #include <QtOpenGL.h>
 
@@ -36,9 +38,7 @@
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/GLPainter.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
-
+#include <Gui/NavigationStyle.h>
 
 #include "Overlay.h"
 
@@ -444,9 +444,6 @@ void paintSelection()
 }
 
 // ---------------------------------------
-#include <Gui/NavigationStyle.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #if 0
 void MeshSelection::prepareFreehandSelection(bool add)
 {
diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index c1e1bc7744..43cb566d4f 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -28,7 +28,8 @@
 #include <QApplication>
 #include <QString>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/OriginFeature.h>
 #include <Gui/Action.h>
 #include <Gui/Application.h>
@@ -37,8 +38,6 @@
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/SelectionFilter.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Mod/Part/App/DatumFeature.h>
 #include <Mod/Part/App/Geometry2d.h>
 #include <Mod/Sketcher/App/Constraint.h>
diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
index f3eccc92fc..50142dbbe5 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
@@ -27,15 +27,14 @@
 #include <QGuiApplication>
 #include <QPainter>
 #endif// #ifndef _PreComp_
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/CommandT.h>
 #include <Gui/MainWindow.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Mod/Sketcher/App/SketchObject.h>
 
 #include "CommandConstraints.h"
diff --git a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
index 2bced92a6d..e7bd088750 100644
--- a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
+++ b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
@@ -29,15 +29,14 @@
 #include <QApplication>
 #include <QDialog>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <Base/Tools.h>
 #include <Gui/Application.h>
 #include <Gui/CommandT.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Notifications.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Mod/Sketcher/App/GeometryFacade.h>
 #include <Mod/Sketcher/App/SketchObject.h>
 
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
index b8dcae8dff..047f1085c9 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -38,7 +38,8 @@
 #include <QScreen>
 #include <QTextStream>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <Base/Console.h>
 #include <Base/Vector3D.h>
 #include <Gui/Application.h>
@@ -52,8 +53,6 @@
 #include <Gui/SelectionObject.h>
 #include <Gui/SoFCUnifiedSelection.h>
 #include <Gui/Utilities.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Mod/Part/App/Geometry.h>
 #include <Mod/Sketcher/App/GeoList.h>
 #include <Mod/Sketcher/App/GeometryFacade.h>
diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
index 83d6e0c79b..404a42629f 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
@@ -35,7 +35,8 @@
 # include <BRepLProp_SLProps.hxx>
 # include <gp_Dir.hxx>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
@@ -50,8 +51,6 @@
 #include <Gui/MainWindow.h>
 #include <Gui/MDIView.h>
 #include <Gui/Selection.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Inventor/SbVec3f.h>
 #include <Mod/TechDraw/App/ArrowPropEnum.h>
 #include <Mod/TechDraw/App/DrawPage.h>
diff --git a/src/Mod/TechDraw/Gui/Grabber3d.cpp b/src/Mod/TechDraw/Gui/Grabber3d.cpp
index 85c8139352..07a8463e8a 100644
--- a/src/Mod/TechDraw/Gui/Grabber3d.cpp
+++ b/src/Mod/TechDraw/Gui/Grabber3d.cpp
@@ -21,12 +21,11 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <Base/Console.h>
 #include <Gui/MainWindow.h>
 #include <Gui/MDIView.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 
 #include "Grabber3d.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp
index 18bb6e419a..7242a04f01 100644
--- a/src/Mod/TechDraw/Gui/QGVPage.cpp
+++ b/src/Mod/TechDraw/Gui/QGVPage.cpp
@@ -34,7 +34,8 @@
 #include <QScrollBar>
 #include <QWheelEvent>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <Base/Parameter.h>
@@ -42,8 +43,6 @@
 #include <Gui/Document.h>
 #include <Gui/NavigationStyle.h>
 #include <Gui/Selection.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawSVGTemplate.h>
diff --git a/src/Mod/TechDraw/Gui/TaskProjection.cpp b/src/Mod/TechDraw/Gui/TaskProjection.cpp
index 9c2e2aa227..87a011d80c 100644
--- a/src/Mod/TechDraw/Gui/TaskProjection.cpp
+++ b/src/Mod/TechDraw/Gui/TaskProjection.cpp
@@ -26,15 +26,14 @@
 #ifndef _PreComp_
 # include <QMessageBox>
 #endif
-
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 #include <Mod/Part/App/PartFeature.h>
 
 #include "TaskProjection.h"