diff --git a/BasePlugin/PluginFunctions.cc b/BasePlugin/PluginFunctions.cc
index 8b0a503d2109335b796b081d7d83182e85036594..9fec1b920f5d9e964cd6f3ac1dd9b62672e736dc 100644
--- a/BasePlugin/PluginFunctions.cc
+++ b/BasePlugin/PluginFunctions.cc
@@ -63,6 +63,9 @@
 #include "PluginFunctions.hh"
 #include "PluginFunctionsCore.hh"
 
+#include <ACG/Scenegraph/SeparatorNode.hh>
+#include <ACG/Scenegraph/MaterialNode.hh>
+
 namespace PluginFunctions {
 
  /** \brief DONT USE DIRECTLY!!
diff --git a/Core/Core.cc b/Core/Core.cc
index cffbbe6d4f53b0f8f35c9a473a1140af90b7656f..ce6435aa62a7b61e0a7f59c95b6252bc224d9b69 100644
--- a/Core/Core.cc
+++ b/Core/Core.cc
@@ -90,6 +90,9 @@
 
 #include <OpenFlipper/common/PluginStorage.hh>
 
+#include <ACG/Scenegraph/MaterialNode.hh>
+#include <ACG/Scenegraph/SeparatorNode.hh>
+
 #define WIDGET_HEIGHT 800
 #define WIDGET_WIDTH  800
 
diff --git a/Core/openFunctions.cc b/Core/openFunctions.cc
index 682de58713eec6fbe69b8e089e76fd7f48b5bc3d..45461ccfe7e954306679166775f863408ec58baa 100644
--- a/Core/openFunctions.cc
+++ b/Core/openFunctions.cc
@@ -63,6 +63,8 @@
 
 #include "OpenFunctionThread.hh"
 
+#include <ACG/Scenegraph/SeparatorNode.hh>
+
 void Core::resetScenegraph( bool _resetTrackBall  ) {
 
   if ( OpenFlipper::Options::gui() && !OpenFlipper::Options::sceneGraphUpdatesBlocked() ) {
diff --git a/Documentation/DeveloperHelpSources/changelog.docu b/Documentation/DeveloperHelpSources/changelog.docu
index 883c73609c25d5da5109dccbce874e39f025895a..e3e520c580691147369545a930db5025e2987bf6 100644
--- a/Documentation/DeveloperHelpSources/changelog.docu
+++ b/Documentation/DeveloperHelpSources/changelog.docu
@@ -5,6 +5,7 @@
      - <b>Breaking changes</b>
          - Picking functions use size_t instead of unsigned int now (Required to get rid of a lot of warnings during compilation)    
          - Enabled AUTOMOC in cmake for QT ( If you get redefinition errors, guard the corresponding headers with a  #pragma once )
+         - Removed a lot of Scenegraph includes in BaseObjectData to reduce gl qt collisions and replaced them with forward declarations. (You have to include the scenegraph headers yourself now!)
      - <b>Core</b>
          - Use QOpenGLDebuglogger
          - Queued cross plugin interconnection feature
diff --git a/common/BaseObjectData.cc b/common/BaseObjectData.cc
index 38e8f87626b34a40158fffd16e9b60c9506d2728..ffdfcc6922463585d7b1b7d9c2e19f8567ef8c4b 100644
--- a/common/BaseObjectData.cc
+++ b/common/BaseObjectData.cc
@@ -65,7 +65,11 @@
 #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
 
 
-
+#include <ACG/Scenegraph/SeparatorNode.hh>
+#include <ACG/QtScenegraph/QtTranslationManipulatorNode.hh>
+#include <ACG/Scenegraph/BoundingBoxNode.hh>
+#include <ACG/Scenegraph/StencilRefNode.hh>
+#include <ACG/Scenegraph/StatusNodesT.hh>
 
 //== TYPEDEFS =================================================================
 
diff --git a/common/BaseObjectData.hh b/common/BaseObjectData.hh
index 82abfba5f2f0c40faf3f5099e3c78d736a1bc986..7c3c10a1fc73dea27499c623aa47571bcfb4de61 100644
--- a/common/BaseObjectData.hh
+++ b/common/BaseObjectData.hh
@@ -71,17 +71,26 @@
 
 #include <OpenFlipper/common/GlobalDefines.hh>
 #include <OpenFlipper/common/BaseObject.hh>
-#include <QObject>
 #include <vector>
-#include <ACG/Scenegraph/MaterialNode.hh>
-#include <ACG/Scenegraph/SeparatorNode.hh>
-#include <ACG/Scenegraph/ShaderNode.hh>
-#include <ACG/Scenegraph/BaseNode.hh>
-#include <ACG/Scenegraph/BoundingBoxNode.hh>
-#include <ACG/Scenegraph/StencilRefNode.hh>
-#include <ACG/QtScenegraph/QtTranslationManipulatorNode.hh>
-
-//== TYPEDEFS =================================================================
+#include <ACG/Scenegraph/PickTarget.hh>
+#include <ACG/Scenegraph/DrawModes.hh>
+
+//== FORWARD Declarations to avoid gl qt collisions =================================================================
+
+namespace ACG {
+namespace SceneGraph {
+
+class MaterialNode;
+class QtTranslationManipulatorNode;
+class SeparatorNode;
+class BaseNode;
+class BoundingBoxNode;
+class StencilRefNode;
+class ShaderNode;
+
+}
+}
+
 
 //== TYPEDEFS FOR SCENEGRAPH ===============================================
 /// Materialnode
diff --git a/common/BaseObjectDataT.cc b/common/BaseObjectDataT.cc
index bedfb9467565cb99b2515e88dc3b96555ec36a76..e0646f5dcd494f1c1c17977678c98618098b0e30 100644
--- a/common/BaseObjectDataT.cc
+++ b/common/BaseObjectDataT.cc
@@ -61,6 +61,8 @@
 //== INCLUDES =================================================================
 
 #include "Types.hh"
+#include <stack>
+#include <ACG/Scenegraph/BaseNode.hh>
 
 //== TYPEDEFS =================================================================
 
diff --git a/libs_required/ACG/Scenegraph/BaseNode.hh b/libs_required/ACG/Scenegraph/BaseNode.hh
index 64911b28e2e3ed7701c369d7848bbac68ab5462c..3addbaba2d09e427f1b5102b7bee4fcd33fb2f2f 100644
--- a/libs_required/ACG/Scenegraph/BaseNode.hh
+++ b/libs_required/ACG/Scenegraph/BaseNode.hh
@@ -75,8 +75,6 @@
 // stdc++
 #include <vector>
 #include <string>
-#include <algorithm>
-#include <iostream>
 #include <ACG/Scenegraph/DrawModes.hh>
 #include <ACG/GL/RenderObject.hh>
 
diff --git a/widgets/coreWidget/viewerControl.cc b/widgets/coreWidget/viewerControl.cc
index 7c23fd3d08f29396752ded9c5fc3713168a92192..759688fbcbdc2e676fdca8b6c7db2b1f9b642a34 100644
--- a/widgets/coreWidget/viewerControl.cc
+++ b/widgets/coreWidget/viewerControl.cc
@@ -71,6 +71,7 @@
   #include <ACG/Utils/VSToolsT.hh>
 #endif
 
+#include <ACG/Scenegraph/MaterialNode.hh>
 
 //== IMPLEMENTATION ==========================================================
 
diff --git a/widgets/glWidget/QtBaseViewer.cc b/widgets/glWidget/QtBaseViewer.cc
index c1740ea4ab126318127962fb6f6c8662f4ad3769..85478107a4ed7512c6618a61c1b26364c23ba8c7 100644
--- a/widgets/glWidget/QtBaseViewer.cc
+++ b/widgets/glWidget/QtBaseViewer.cc
@@ -68,6 +68,7 @@
 #include <ACG/QtWidgets/QtWheel.hh>
 #include <ACG/Scenegraph/CoordsysNode.hh>
 #include <ACG/Scenegraph/SceneGraphAnalysis.hh>
+#include <ACG/Scenegraph/StencilRefNode.hh>
 #include <ACG/GL/GLError.hh>
 #include <ACG/GL/IRenderer.hh>