diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 8fd0d8aed7..ab94da3544 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -110,12 +110,12 @@ void CSVRender::TerrainSelection::toggleSelect(const std::vector<std::pair<int,
 
 void CSVRender::TerrainSelection::activate()
 {
-    mParentNode->addChild(mSelectionNode);
+    if (!mParentNode->containsNode(mSelectionNode)) mParentNode->addChild(mSelectionNode);
 }
 
 void CSVRender::TerrainSelection::deactivate()
 {
-    mParentNode->removeChild(mSelectionNode);
+    if (mParentNode->containsNode(mSelectionNode)) mParentNode->removeChild(mSelectionNode);
 }
 
 void CSVRender::TerrainSelection::update()
diff --git a/apps/opencs/view/render/terraintexturemode.hpp b/apps/opencs/view/render/terraintexturemode.hpp
index 1f18409b03..72e7df9dee 100644
--- a/apps/opencs/view/render/terraintexturemode.hpp
+++ b/apps/opencs/view/render/terraintexturemode.hpp
@@ -6,6 +6,8 @@
 #include <string>
 #include <memory>
 
+#include <osg/Group>
+
 #include <QWidget>
 #include <QEvent>
 
@@ -28,8 +30,6 @@ namespace CSVWidget
 
 namespace CSVRender
 {
-    class PagedWorldspaceWidget;
-
     class TerrainTextureMode : public EditMode
     {
         Q_OBJECT