diff --git a/src/Gui/SoFCUnifiedSelection.h b/src/Gui/SoFCUnifiedSelection.h
index 9c76355668..aab5158dbb 100644
--- a/src/Gui/SoFCUnifiedSelection.h
+++ b/src/Gui/SoFCUnifiedSelection.h
@@ -198,4 +198,4 @@ private:
 
 } // namespace Gui
 
-#endif // !GUI_SOFCSELECTION_H
+#endif // !GUI_SOFCUNIFIEDSELECTION_H
diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp
index f5e1589b12..fb6e5f8590 100644
--- a/src/Gui/View3DPy.cpp
+++ b/src/Gui/View3DPy.cpp
@@ -43,7 +43,6 @@
 #include "Application.h"
 #include "Document.h"
 #include "NavigationStyle.h"
-#include "SoFCSelection.h"
 #include "SoFCSelectionAction.h"
 #include "SoFCOffscreenRenderer.h"
 #include "SoFCVectorizeSVGAction.h"
diff --git a/src/Gui/ViewProviderFeature.cpp b/src/Gui/ViewProviderFeature.cpp
index ef694374cc..9232574496 100644
--- a/src/Gui/ViewProviderFeature.cpp
+++ b/src/Gui/ViewProviderFeature.cpp
@@ -37,7 +37,6 @@
 #include <App/Document.h>
 
 #include "Window.h"
-#include "SoFCSelection.h"
 #include "ViewProviderFeature.h"
 #include "View3DInventorViewer.h"
 
diff --git a/src/Gui/ViewProviderFeature.h b/src/Gui/ViewProviderFeature.h
index 819877debb..076c43e3ff 100644
--- a/src/Gui/ViewProviderFeature.h
+++ b/src/Gui/ViewProviderFeature.h
@@ -33,7 +33,6 @@ class SbVec2s;
 
 namespace Gui {
 
-class SoFCSelection;
 class View3DInventorViewer;
 
 class GuiExport ViewProviderFeature:public ViewProviderDocumentObject
diff --git a/src/Gui/ViewProviderMeasureDistance.cpp b/src/Gui/ViewProviderMeasureDistance.cpp
index 4c57cfa828..5db344cded 100644
--- a/src/Gui/ViewProviderMeasureDistance.cpp
+++ b/src/Gui/ViewProviderMeasureDistance.cpp
@@ -41,7 +41,6 @@
 #endif
 
 #include "ViewProviderMeasureDistance.h"
-#include "SoFCSelection.h"
 #include "Application.h"
 #include "Document.h"
 #include "View3DInventorViewer.h"
diff --git a/src/Gui/ViewProviderPlacement.cpp b/src/Gui/ViewProviderPlacement.cpp
index ef6389de44..43ee983854 100644
--- a/src/Gui/ViewProviderPlacement.cpp
+++ b/src/Gui/ViewProviderPlacement.cpp
@@ -44,7 +44,6 @@
 #include <Inventor/nodes/SoAnnotation.h>
 #include <Inventor/details/SoLineDetail.h>
 #include "ViewProviderPlacement.h"
-#include "SoFCSelection.h"
 #include "Application.h"
 #include "Document.h"
 #include "View3DInventorViewer.h"
diff --git a/src/Gui/ViewProviderPlane.cpp b/src/Gui/ViewProviderPlane.cpp
index 397b7e0b9a..49376cb9cd 100644
--- a/src/Gui/ViewProviderPlane.cpp
+++ b/src/Gui/ViewProviderPlane.cpp
@@ -44,7 +44,6 @@
 #include <Inventor/nodes/SoAnnotation.h>
 #include <Inventor/details/SoLineDetail.h>
 #include "ViewProviderPlane.h"
-#include "SoFCSelection.h"
 #include "Application.h"
 #include "Document.h"
 #include "View3DInventorViewer.h"
diff --git a/src/Gui/ViewProviderPythonFeature.cpp b/src/Gui/ViewProviderPythonFeature.cpp
index b007705bb1..05fadc1c68 100644
--- a/src/Gui/ViewProviderPythonFeature.cpp
+++ b/src/Gui/ViewProviderPythonFeature.cpp
@@ -53,8 +53,6 @@
 
 #include "ViewProviderPythonFeature.h"
 #include "ViewProviderPythonFeaturePy.h"
-#include "SoFCSelection.h"
-#include "SoFCBoundingBox.h"
 #include "Tree.h"
 #include "Window.h"
 #include "Application.h"
diff --git a/src/Gui/ViewProviderPythonFeature.h b/src/Gui/ViewProviderPythonFeature.h
index 87f2b74a5a..a845f2f46e 100644
--- a/src/Gui/ViewProviderPythonFeature.h
+++ b/src/Gui/ViewProviderPythonFeature.h
@@ -34,8 +34,6 @@ class SoDragger;
 class SoNode;
 
 namespace Gui {
-class SoFCSelection;
-class SoFCBoundingBox;
 
 class GuiExport ViewProviderPythonFeatureImp
 {
diff --git a/src/Mod/Drawing/Gui/ViewProviderPage.cpp b/src/Mod/Drawing/Gui/ViewProviderPage.cpp
index 4550610177..3998058cd6 100644
--- a/src/Mod/Drawing/Gui/ViewProviderPage.cpp
+++ b/src/Mod/Drawing/Gui/ViewProviderPage.cpp
@@ -41,7 +41,6 @@
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Application.h>
-#include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 #include <Gui/MainWindow.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/Drawing/Gui/ViewProviderView.cpp b/src/Mod/Drawing/Gui/ViewProviderView.cpp
index ca0f86afa7..535642f722 100644
--- a/src/Mod/Drawing/Gui/ViewProviderView.cpp
+++ b/src/Mod/Drawing/Gui/ViewProviderView.cpp
@@ -37,7 +37,6 @@
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 
 #include <Mod/Drawing/App/FeatureView.h>
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
index 99881f8238..382e0f4ff0 100755
--- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
@@ -55,7 +55,6 @@
 
 #include <Mod/Fem/App/FemMeshObject.h>
 #include <Mod/Fem/App/FemMesh.h>
-#include <Gui/SoFCSelection.h>
 #include <App/Document.h>
 #include <Base/FileInfo.h>
 #include <Base/Stream.h>
diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp
index 9f171d228a..a812e2fdbb 100644
--- a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp
+++ b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp
@@ -76,7 +76,7 @@ void ViewProviderImagePlane::attach(App::DocumentObject *pcObj)
     ViewProviderDocumentObject::attach(pcObj);
 
     // NOTE: SoFCSelection node has beem removed because it led to
-    // problems using the image as a construction plan with the
+    // problems using the image as a construction plane with the
     // draft commands
     SoSeparator* planesep = new SoSeparator;
     planesep->addChild(pcCoords);
diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.h b/src/Mod/Image/Gui/ViewProviderImagePlane.h
index 9a1240161e..6d45c27eb7 100644
--- a/src/Mod/Image/Gui/ViewProviderImagePlane.h
+++ b/src/Mod/Image/Gui/ViewProviderImagePlane.h
@@ -25,7 +25,6 @@
 #define IMAGE_ViewProviderImagePlane_H
 
 #include <Gui/ViewProviderGeometryObject.h>
-#include <Gui/SoFCSelection.h>
 
 class SoCoordinate3;
 class SoDrawStyle;
diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp
index 66140d351c..d6de4f329d 100644
--- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp
+++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp
@@ -51,7 +51,6 @@
 #include <Gui/Flag.h>
 #include <Gui/MainWindow.h>
 #include <Gui/SoFCColorBar.h>
-#include <Gui/SoFCSelection.h>
 #include <Gui/ViewProviderGeometryObject.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/Widgets.h>
diff --git a/src/Mod/Part/Gui/ViewProvider.cpp b/src/Mod/Part/Gui/ViewProvider.cpp
index c488cf7888..9e12614877 100644
--- a/src/Mod/Part/Gui/ViewProvider.cpp
+++ b/src/Mod/Part/Gui/ViewProvider.cpp
@@ -83,7 +83,6 @@
 #include <App/Application.h>
 #include <App/Document.h>
 #include <Gui/Command.h>
-#include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 #include <Gui/View3DInventorViewer.h>
 
diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.h b/src/Mod/Part/Gui/ViewProvider2DObject.h
index 2c59f92841..631adce595 100644
--- a/src/Mod/Part/Gui/ViewProvider2DObject.h
+++ b/src/Mod/Part/Gui/ViewProvider2DObject.h
@@ -34,11 +34,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderBox.h b/src/Mod/Part/Gui/ViewProviderBox.h
index 805671b9be..366c59118d 100644
--- a/src/Mod/Part/Gui/ViewProviderBox.h
+++ b/src/Mod/Part/Gui/ViewProviderBox.h
@@ -33,11 +33,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.h b/src/Mod/Part/Gui/ViewProviderCircleParametric.h
index 888a0d98fe..3436fd9ebc 100644
--- a/src/Mod/Part/Gui/ViewProviderCircleParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.h
@@ -33,11 +33,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.h b/src/Mod/Part/Gui/ViewProviderConeParametric.h
index 9fc6f48284..3d41d8c43a 100644
--- a/src/Mod/Part/Gui/ViewProviderConeParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderConeParametric.h
@@ -33,11 +33,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h
index 133eccca92..0496a34b07 100644
--- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h
@@ -33,11 +33,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h
index a788d40ff3..10f87d3ad7 100644
--- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h
@@ -33,11 +33,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderImport.cpp b/src/Mod/Part/Gui/ViewProviderImport.cpp
index 614178b328..6bf6bf3f04 100644
--- a/src/Mod/Part/Gui/ViewProviderImport.cpp
+++ b/src/Mod/Part/Gui/ViewProviderImport.cpp
@@ -34,7 +34,6 @@
 #include <Base/Exception.h>
 #include <Base/Sequencer.h>
 #include <Gui/View3DInventorViewer.h>
-#include <Gui/SoFCSelection.h>
 #include <App/Application.h>
 
 #include "ViewProviderImport.h"
diff --git a/src/Mod/Part/Gui/ViewProviderImport.h b/src/Mod/Part/Gui/ViewProviderImport.h
index e90c71cbca..7b043c879d 100644
--- a/src/Mod/Part/Gui/ViewProviderImport.h
+++ b/src/Mod/Part/Gui/ViewProviderImport.h
@@ -33,11 +33,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.h b/src/Mod/Part/Gui/ViewProviderLineParametric.h
index d71b34cd1a..1ba61ed56d 100644
--- a/src/Mod/Part/Gui/ViewProviderLineParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderLineParametric.h
@@ -33,11 +33,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h
index 9514997591..fe2e41901e 100644
--- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h
@@ -33,11 +33,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.h b/src/Mod/Part/Gui/ViewProviderPointParametric.h
index 2130d270d7..22d1140240 100644
--- a/src/Mod/Part/Gui/ViewProviderPointParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderPointParametric.h
@@ -33,11 +33,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderReference.cpp b/src/Mod/Part/Gui/ViewProviderReference.cpp
index f6dde6203c..9b4913547e 100644
--- a/src/Mod/Part/Gui/ViewProviderReference.cpp
+++ b/src/Mod/Part/Gui/ViewProviderReference.cpp
@@ -79,7 +79,6 @@
 #include <Base/Exception.h>
 #include <App/Application.h>
 #include <App/Document.h>
-#include <Gui/SoFCSelection.h>
 #include <Gui/Selection.h>
 #include <Gui/View3DInventorViewer.h>
 
diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.h b/src/Mod/Part/Gui/ViewProviderTorusParametric.h
index e60523ec4a..1652fa425f 100644
--- a/src/Mod/Part/Gui/ViewProviderTorusParametric.h
+++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.h
@@ -33,11 +33,6 @@ class SoSeparator;
 class SbVec3f;
 class SoTransform;
 
-namespace Gui {
-  class View3DInventorViewer;
-  class SoFCSelection;
-}
-
 namespace PartGui {
 
 
diff --git a/src/Mod/Points/Gui/ViewProvider.h b/src/Mod/Points/Gui/ViewProvider.h
index 22d6258980..40e978b1af 100644
--- a/src/Mod/Points/Gui/ViewProvider.h
+++ b/src/Mod/Points/Gui/ViewProvider.h
@@ -41,10 +41,6 @@ namespace App {
   class PropertyColorList;
 }
 
-namespace Gui {
-  class SoFCSelection;
-}
-
 namespace Points {
   class PropertyGreyValueList;
   class PropertyNormalList;
diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h
index 11d48049e7..cd2deb9b25 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h
@@ -30,11 +30,6 @@
 
 class QPixmap;
 
-namespace Gui {
-    class View3DInventorViewer;
-    class SoFCSelection;
-}
-
 namespace Sketcher {
     class Sketch;
     class SketchObject;
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.h b/src/Mod/Sketcher/Gui/ViewProviderSketch.h
index 323f64eda0..7761d98d9f 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h
@@ -58,7 +58,6 @@ struct EditData;
 
 namespace Gui {
     class View3DInventorViewer;
-    class SoFCSelection;
 }
 
 namespace Sketcher {