diff --git a/ContextMenuDataControl.cc b/ContextMenuDataControl.cc
index 3f0288e37ac72cefbeef2c5855dfe336cd4a6650..9e65c0f20e258b40a27239b5944f5c70e11e8bb5 100644
--- a/ContextMenuDataControl.cc
+++ b/ContextMenuDataControl.cc
@@ -51,7 +51,6 @@
 
 
 #include "DataControlPlugin.hh"
-#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
 
 void DataControlPlugin::slotContextMenuTarget( ) {
   QVariant contextObject = targetAction_->data();
diff --git a/DataControlPlugin.cc b/DataControlPlugin.cc
index c7458e6dfcf172f7093ced4f55131fcac3e962b8..2e57aaf19c69b22b1f10044a5453ac8482e3a01d 100644
--- a/DataControlPlugin.cc
+++ b/DataControlPlugin.cc
@@ -49,30 +49,15 @@
 
 #include "DataControlPlugin.hh"
 
-#if QT_VERSION >= 0x050000 
-  #include <QtWidgets>
+#if QT_VERSION >= 0x050000
 #else
   #include <QtGui>
 #endif
 
-#include <QLayout>
-#include <QGridLayout>
-#include <QItemSelectionModel>
-
-#include <iostream>
-#include <ACG/GL/GLState.hh>
-#include <QStringList>
-#include <ACG/Scenegraph/BaseNode.hh>
 #include <ACG/QtWidgets/QtMaterialDialog.hh>
-#include <QModelIndexList>
 
 #include <queue>
 
-#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
-#include <OpenFlipper/common/GlobalOptions.hh>
-
-#include <ObjectTypes/Light/Light.hh>
-
 //******************************************************************************
 
 const ACG::Vec4f base_color (0.0f,0.0f,0.5f,1.0f);
diff --git a/DataControlPluginScripting.cc b/DataControlPluginScripting.cc
index fae7ee375d1c55b5fc4d0c0a5b70dff75a15d65c..6e308f3926b2cfe080fc1663224c82150222d910 100644
--- a/DataControlPluginScripting.cc
+++ b/DataControlPluginScripting.cc
@@ -52,8 +52,6 @@
 
 #include "DataControlPlugin.hh"
 
-#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
-
 
 //******************************************************************************
 
diff --git a/DefaultObjectMarker.cc b/DefaultObjectMarker.cc
index 9684a6952ec244148163600121bd1065c73a3fb4..cab89f663f0e461e065d81145d7dd9d0dad2d946 100644
--- a/DefaultObjectMarker.cc
+++ b/DefaultObjectMarker.cc
@@ -48,7 +48,6 @@
 \*===========================================================================*/
 
 #include <OpenFlipper/common/Types.hh>
-#include <OpenFlipper/common/BaseObjectData.hh>
 #include "DefaultObjectMarker.hh"
 
 //******************************************************************************
diff --git a/Popup.cc b/Popup.cc
index 6e3e363913c180f3f6c76d399fee1cd9b6ac2c29..35f5d0954cfaa7060c4d9c6821d9f80b366c0f04 100644
--- a/Popup.cc
+++ b/Popup.cc
@@ -52,13 +52,8 @@
 
 #include "DataControlPlugin.hh"
 
-#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
-#include <OpenFlipper/common/GlobalOptions.hh>
-
 #include <ACG/QtWidgets/QtMaterialDialog.hh>
 
-#include <QInputDialog>
-#include <QMessageBox>
 #include "Menu.hh"
 
 #include <ObjectTypes/Light/LightWidget.hh>
diff --git a/Toolbox.cc b/Toolbox.cc
index 90d618c32c228e70313b380365b42def36c230a4..8c8d89e0e9138a3b63a44b6e4f8843cc8d62e43a 100644
--- a/Toolbox.cc
+++ b/Toolbox.cc
@@ -49,8 +49,6 @@
 
 #include "Toolbox.hh"
 
-#include <iostream>
-
 DatacontrolToolboxWidget::DatacontrolToolboxWidget(QWidget* _parent)
     : QWidget(_parent)
 {
diff --git a/TreeModel.cc b/TreeModel.cc
index 9c6cfdedc3b185bf14be31910b5f43588507311c..669fbbb05b49ea95276b35d85818ecc3aad7aeb4 100644
--- a/TreeModel.cc
+++ b/TreeModel.cc
@@ -55,12 +55,7 @@
   #include <QtGui>
 #endif
 
-#include <QBrush>
 
-#include <iostream>
-
-
-#include <OpenFlipper/common/Types.hh>
 #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
 #include <OpenFlipper/common/GlobalOptions.hh>
 
diff --git a/TreeView.cc b/TreeView.cc
index ca4ba9a74a26a4f517648384456a536430ae21fa..bda8331fb532004d4e0cd4693f30797e13cb1204 100644
--- a/TreeView.cc
+++ b/TreeView.cc
@@ -48,7 +48,6 @@
 \*===========================================================================*/
 
 #include "TreeView.hh"
-#include <iostream>
 
 DataControlTreeView::DataControlTreeView(QWidget* _parent)
     : QTreeView(_parent)