Core: Revert superfluous changes made with PR #9521

src/Mod/Sandbox/Gui/AppSandboxGui.cpp

@@ -30,8 +30,7 @@
 # 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>
@@ -43,6 +42,8 @@
 #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>

src/Mod/Sandbox/Gui/Command.cpp

@@ -58,9 +58,7 @@
 # include <boost/bind/bind.hpp>
 # include <memory>
 #endif
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
-#include <Gui/Tools.h>
+
 #include <Base/Console.h>
 #include <Base/Sequencer.h>
 #include <App/Application.h>
@@ -70,6 +68,9 @@
 #include <Gui/Command.h>
 #include <Gui/MainWindow.h>
 #include <Gui/FileDialog.h>
+#include <Gui/Tools.h>
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include <Gui/WaitCursor.h>
 
 #include <Mod/Sandbox/App/DocumentThread.h>

src/Mod/Sandbox/Gui/Overlay.cpp

@@ -29,8 +29,6 @@
 # include <Inventor/nodes/SoOrthographicCamera.h>
 # include <Inventor/nodes/SoImage.h>
 #endif
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
 
 #include <QtOpenGL.h>
 
@@ -38,7 +36,9 @@
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/GLPainter.h>
-#include <Gui/NavigationStyle.h>
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
+
 
 #include "Overlay.h"
 
@@ -435,6 +435,9 @@ void paintSelection()
 }
 
 // ---------------------------------------
+#include <Gui/NavigationStyle.h>
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #if 0
 void MeshSelection::prepareFreehandSelection(bool add)
 {

src/Mod/Sandbox/Gui/PreCompiled.h

@@ -26,10 +26,6 @@
 
 #include <FCConfig.h>
 
-#ifdef FC_OS_WIN32
-# include <windows.h>
-#endif
-
 // Importing of App classes
 #ifdef FC_OS_WIN32
 # define SandboxAppExport __declspec(dllimport)
@@ -66,6 +62,10 @@
 // Xerces
 #include <xercesc/util/XercesDefs.hpp>
 
+#ifdef FC_OS_WIN32
+# include <windows.h>
+#endif
+
 // Qt Toolkit
 #include <qaction.h>
 #include <qapplication.h>