diff --git a/baseWidget.cc b/baseWidget.cc
index 99b4138fb5b3d6c54556eb1ae7d2002740b19637..8afb331a6623b160b0f1e3757cab3f0886294df1 100644
--- a/baseWidget.cc
+++ b/baseWidget.cc
@@ -49,15 +49,12 @@
 
 //== INCLUDES =================================================================
 #include <QVBoxLayout>
-#include <QHBoxLayout>
 #include <QPushButton>
 #include <QDialog>
 #include <QTextEdit>
 #include <QFileDialog>
 #include <QMenu>
-#include <QAction>
 #include <QMenuBar>
-#include <QIcon>
 #include <QMessageBox>
 
 #include <QApplication>
@@ -65,11 +62,9 @@
 #include <QScriptEngine>
 
 #include <QDomDocument>
-#include <QDomElement>
 
 #include <QXmlQuery>
 #include <QXmlResultItems>
-#include <QRegExp>
 
 #include <OpenFlipper/common/GlobalOptions.hh>
 
@@ -78,7 +73,6 @@
 #include "scene/sceneElement.hh"
 
 #include "parser/context.hh"
-#include "parser/element.hh"
 
 //== NAMESPACES ===============================================================
 namespace VSI {
diff --git a/config/configDialog.cc b/config/configDialog.cc
index 571107b3feff28c434b618272a403a79ceb15290..fb865c57d25c91eb55835b74377823140dcd40a2 100644
--- a/config/configDialog.cc
+++ b/config/configDialog.cc
@@ -50,8 +50,6 @@
 //== INCLUDES =================================================================
 #include <QPushButton>
 #include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QGridLayout>
 #include <QScrollArea>
 #include <QLineEdit>
 #include <QLabel>
diff --git a/config/configValue.cc b/config/configValue.cc
index dc0c4e3013f3fafe7faf02429a3dadde2ba431c5..67630fe18f97e832b7db7593fdbce36bc5a0fe85 100644
--- a/config/configValue.cc
+++ b/config/configValue.cc
@@ -49,12 +49,10 @@
 
 //== INCLUDES =================================================================
 #include <QVBoxLayout>
-#include <QHBoxLayout>
 #include <QFrame>
 
 #include "../scene/elementInput.hh"
 #include "../parser/type.hh"
-#include "../parser/inout.hh"
 #include "../parser/element.hh"
 #include "../parser/context.hh"
 
diff --git a/config/dynamicDialog.cc b/config/dynamicDialog.cc
index 4ba10ed1c2141c453581be239c2059a2fe6e941f..c995a5496b60f2f31b4c431df31ad3b30b71c584 100644
--- a/config/dynamicDialog.cc
+++ b/config/dynamicDialog.cc
@@ -50,8 +50,6 @@
 //== INCLUDES =================================================================
 #include <QPushButton>
 #include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QGridLayout>
 #include <QScrollArea>
 
 
diff --git a/config/dynamicValue.cc b/config/dynamicValue.cc
index 466ed8e466601424ee11753adef3e1e84fad8dcf..f6f8a47fcabd75d4f9a3d225ac86bb453e7379aa 100644
--- a/config/dynamicValue.cc
+++ b/config/dynamicValue.cc
@@ -52,7 +52,6 @@
 
 #include "../scene/elementInput.hh"
 #include "../parser/type.hh"
-#include "../parser/inout.hh"
 #include "../parser/element.hh"
 #include "../parser/context.hh"
 
diff --git a/parser/context.cc b/parser/context.cc
index fbfa7a4f68a303a68838f115569aaf39e037d3f2..3fc92a2f2591ff1073f48bbc456db2b0388ee231 100644
--- a/parser/context.cc
+++ b/parser/context.cc
@@ -49,12 +49,8 @@
 
 //== INCLUDES =================================================================
 #include <QBuffer>
-#include <QStringList>
 #include <QXmlQuery>
 #include <QXmlResultItems>
-#include <QRegExp>
-
-#include <iostream>
 
 #include "context.hh"
 #include "input.hh"
diff --git a/parser/function.cc b/parser/function.cc
index 2103c9eefca30b420472616dce405cfe6261b0bd..9a29dc4f666d552a5348952f572bcc9cf76ad7c2 100644
--- a/parser/function.cc
+++ b/parser/function.cc
@@ -51,7 +51,6 @@
 #include "function.hh"
 #include "element.hh"
 #include "input.hh"
-#include "output.hh"
 
 //== NAMESPACES ===============================================================
 namespace VSI {
diff --git a/scene/arrow.cc b/scene/arrow.cc
index f11fbb550f060933a42eb0bb140cddb50546b384..2fd561d1223fda215ca215c639ddb901cb1e0847 100644
--- a/scene/arrow.cc
+++ b/scene/arrow.cc
@@ -48,12 +48,10 @@
 \*===========================================================================*/
 
 //== INCLUDES =================================================================
-#include <cmath>
 
 #include <QPainterPath>
 #include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
 
 #include <OpenFlipper/common/GlobalOptions.hh>
 
diff --git a/scene/button.cc b/scene/button.cc
index 40075350cf3ccce55f6cd1d38648eb4ca22e8621..ae1f6a886b6fb6aeae011b475c3e3bfc5fc49e5c 100644
--- a/scene/button.cc
+++ b/scene/button.cc
@@ -48,14 +48,12 @@
 \*===========================================================================*/
 
 //== INCLUDES =================================================================
-#include <cmath>
 
 #include <QPolygonF>
 #include <QGraphicsItem>
 #include <QFontMetrics>
 #include <QPen>
 #include <QPainter>
-#include <QPainterPath>
 #include <QGraphicsSceneMouseEvent>
 
 #include "button.hh"
diff --git a/scene/connection.cc b/scene/connection.cc
index f679a05e95858be63ec15535554fa3d9ab2bd96c..f22302201e9caf09992a769a8b90d5d4fa0c9876 100644
--- a/scene/connection.cc
+++ b/scene/connection.cc
@@ -51,8 +51,6 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsScene>
 
-#include <QPen>
-
 #include "elementInOut.hh"
 #include "elementInput.hh"
 #include "elementOutput.hh"
@@ -62,8 +60,6 @@
 #include "elementArea.hh"
 #include "wayfind.hh"
 
-#include "../parser/inout.hh"
-
 //== NAMESPACES ===============================================================
 namespace VSI {
 
diff --git a/scene/elementArea.cc b/scene/elementArea.cc
index d41e0c126e6f6b626a4a04a71ad51834f0308357..2cf9667ba6c61a9f02101aea84184a31dc2066ee 100644
--- a/scene/elementArea.cc
+++ b/scene/elementArea.cc
@@ -50,7 +50,6 @@
 //== INCLUDES =================================================================
 #include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
 
 #include "../parser/element.hh"
 #include "elementArea.hh"
diff --git a/scene/elementInput.cc b/scene/elementInput.cc
index 3b89c11ee3bc6085cf44c2a12bf0e0e6b9bde171..147122094bc3b4307e848e99b122fa5567bbc468 100644
--- a/scene/elementInput.cc
+++ b/scene/elementInput.cc
@@ -55,7 +55,6 @@
 #include "connection.hh"
 #include "graphicsScene.hh"
 #include "text.hh"
-#include "../parser/input.hh"
 #include "../parser/element.hh"
 #include "../parser/context.hh"
 #include "../parser/type.hh"
diff --git a/scene/functionDisplay.cc b/scene/functionDisplay.cc
index d69ff4cbbf8dd4e6bb72c566ec02e6ed35b216ae..e6b3775284a07a55e798371ba01ec20c5bcf6308 100644
--- a/scene/functionDisplay.cc
+++ b/scene/functionDisplay.cc
@@ -49,10 +49,7 @@
 
 //== INCLUDES =================================================================
 #include <QWidget>
-#include <QPushButton>
 #include <QPainter>
-#include <QPainterPath>
-#include <QPalette>
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsGridLayout>
@@ -60,7 +57,6 @@
 #include "baseWidget.hh"
 
 #include "functionDisplay.hh"
-#include "graphicsScene.hh"
 #include "elementFunction.hh"
 #include "text.hh"
 #include "button.hh"
diff --git a/scene/graphicsScene.cc b/scene/graphicsScene.cc
index 5319770bc47e14489de4b600e9ef1cc19bce76e5..d77edcb8a55da0495414b92d19e727a53a89a05e 100644
--- a/scene/graphicsScene.cc
+++ b/scene/graphicsScene.cc
@@ -57,7 +57,6 @@
 
 #include "elementInput.hh"
 #include "elementOutput.hh"
-#include "elementInOut.hh"
 #include "elementFunction.hh"
 #include "connection.hh"
 #include "connectionPoint.hh"
@@ -66,21 +65,12 @@
 #include "baseWidget.hh"
 
 #include <QApplication>
-#include <QPainter>
-#include <QPainterPath>
 #include <QPaintEngine>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneDragDropEvent>
 #include <QMimeData>
-#include <QGraphicsRectItem>
-#include <QSet>
 
-#include <QXmlQuery>
 #include <QXmlResultItems>
-#include <QRegExp>
 
 #include "../parser/context.hh"
-#include "../parser/inout.hh"
 #include "../parser/output.hh"
 #include "../parser/function.hh"
 
diff --git a/scene/sceneElement.cc b/scene/sceneElement.cc
index dad7ac222e7afb7380fec76dcc612f018c9c0ac7..7ff23d22196e2f4d38ca3ddb3025337fffcfa4ba 100644
--- a/scene/sceneElement.cc
+++ b/scene/sceneElement.cc
@@ -51,16 +51,13 @@
 #include <QWidget>
 #include <QVBoxLayout>
 #include <QLabel>
-#include <QPushButton>
 #include <QMessageBox>
 #include <QPainter>
-#include <QPalette>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsGridLayout>
 #include <QGraphicsView>
-#include <QRegExp>
 
 #include <QDomText>
 #include <QXmlResultItems>
@@ -80,8 +77,6 @@
 #include "config/configDialog.hh"
 
 #include "../parser/element.hh"
-#include "../parser/input.hh"
-#include "../parser/type.hh"
 #include "../parser/context.hh"
 #include "../parser/function.hh"
 
diff --git a/scene/sceneTools.cc b/scene/sceneTools.cc
index 11a61f26c0ddd624ee18b397e577c0727ddfe7c8..bf450220c2a634a4bc405bbb9e530a4b696dca4e 100644
--- a/scene/sceneTools.cc
+++ b/scene/sceneTools.cc
@@ -50,10 +50,7 @@
 //== INCLUDES =================================================================
 #include <QWidget>
 #include <QVBoxLayout>
-#include <QLabel>
-#include <QPushButton>
 #include <QPainter>
-#include <QPalette>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsGridLayout>
 #include <QGraphicsLinearLayout>
diff --git a/scene/text.cc b/scene/text.cc
index e99abe24a2a13d11ec25f0e4cafc6102f40f4c13..3138a49c050323a2d68795f5beb0ac7a593eda44 100644
--- a/scene/text.cc
+++ b/scene/text.cc
@@ -48,14 +48,12 @@
 \*===========================================================================*/
 
 //== INCLUDES =================================================================
-#include <cmath>
 
 #include <QPolygonF>
 #include <QGraphicsItem>
 #include <QFontMetrics>
 #include <QPen>
 #include <QPainter>
-#include <QPainterPath>
 
 #include "text.hh"
 
diff --git a/scene/trash.cc b/scene/trash.cc
index 6f3c519f42cfb79abea5858fd56f2f3be964a5af..3243b6b42e4ed647850d82b402b09a6b09015dfc 100644
--- a/scene/trash.cc
+++ b/scene/trash.cc
@@ -51,7 +51,6 @@
 #include <QPixmap>
 #include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
 
 #include <OpenFlipper/common/GlobalOptions.hh>
 
diff --git a/scene/wayfind.cc b/scene/wayfind.cc
index 69347610cb21a7b56689acfedbdac074b318148a..304f8b5cc293f5efc3e1aa692822af24ebd9579a 100644
--- a/scene/wayfind.cc
+++ b/scene/wayfind.cc
@@ -49,8 +49,6 @@
 
 //== INCLUDES =================================================================
 #include <QRectF>
-#include <QRect>
-#include <QPointF>
 #include <QVector>
 #include <QHash>
 #include <QLinkedList>
diff --git a/scene/zoomButton.cc b/scene/zoomButton.cc
index 3f20a0fe99190ada5aef75c2aa48136ddb2e46f4..89d842f4135d3198b2d8b579990ba605a1002776 100644
--- a/scene/zoomButton.cc
+++ b/scene/zoomButton.cc
@@ -51,7 +51,6 @@
 #include <QPixmap>
 #include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
 
 #include <OpenFlipper/common/GlobalOptions.hh>
 
diff --git a/toolBoxElement.cc b/toolBoxElement.cc
index 189c5b9e9a9273fab9e14851fa0ab581e8df711e..1b7168bc37bb466d05b8a91344b38c1147878668 100644
--- a/toolBoxElement.cc
+++ b/toolBoxElement.cc
@@ -54,7 +54,6 @@
 #include <QMimeData>
 #include <QDrag>
 #include <QMouseEvent>
-#include <QPalette>
 
 #include "toolBoxElement.hh"
 #include "parser/element.hh"
diff --git a/types/boolWidget.cc b/types/boolWidget.cc
index d1b90252fc1fa66428f5782b34c7873dd9c9b685..c5a29ba23fbcd6571b461423203dfe3f97f8e917 100644
--- a/types/boolWidget.cc
+++ b/types/boolWidget.cc
@@ -50,7 +50,6 @@
 //== INCLUDES =================================================================
 #include <QHBoxLayout>
 #include <QRadioButton>
-#include <QPushButton>
 
 #include "boolWidget.hh"
 
diff --git a/types/objectId/SelectionObjectMarker.cc b/types/objectId/SelectionObjectMarker.cc
index f1eb1f014ea3e6f690cd197783ce6edc068dab4b..e18c619da904d6b78f2508993d7c4ba964de3461 100644
--- a/types/objectId/SelectionObjectMarker.cc
+++ b/types/objectId/SelectionObjectMarker.cc
@@ -48,7 +48,6 @@
 \*===========================================================================*/
 
 #include <OpenFlipper/common/Types.hh>
-#include <OpenFlipper/common/BaseObjectData.hh>
 #include "SelectionObjectMarker.hh"
 
 //******************************************************************************
diff --git a/types/objectId/TreeModel.cc b/types/objectId/TreeModel.cc
index 958d9b882679f4561dbd3977ad0265f609a6c8e6..e808f29db444ec1af42421776cb5b65454f18f6d 100644
--- a/types/objectId/TreeModel.cc
+++ b/types/objectId/TreeModel.cc
@@ -51,15 +51,10 @@
 
 #include "TreeModel.hh"
 
-#include <iostream>
 
-
-#include <OpenFlipper/common/Types.hh>
 #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
 
-#include <QBrush>
-
-#if QT_VERSION >= 0x050000 
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #else
 #include <QtGui>
diff --git a/types/objectId/objectIdWidget.cc b/types/objectId/objectIdWidget.cc
index aff69bf3f608dda534d99369184f7a010e76bbfb..ae59732e938390ead0ea56c721c546d4e76fce31 100644
--- a/types/objectId/objectIdWidget.cc
+++ b/types/objectId/objectIdWidget.cc
@@ -56,7 +56,6 @@
 
 #include "objectIdWidget.hh"
 #include "objectPickDialog.hh"
-#include "TreeModel.hh"
 
 //== NAMESPACES ===============================================================
 namespace VSI {
diff --git a/types/objectId/objectPickDialog.cc b/types/objectId/objectPickDialog.cc
index e2eafb9091ccb1fd4507a5de511e826f44b1b9a6..7e2bf98020471f0163892ba367b44b16dc1033e6 100644
--- a/types/objectId/objectPickDialog.cc
+++ b/types/objectId/objectPickDialog.cc
@@ -49,7 +49,6 @@
 
 //== INCLUDES =================================================================
 #include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <QPushButton>
 #include <QTreeView>
 #include <QMouseEvent>
@@ -60,7 +59,6 @@
 
 #include "objectPickDialog.hh"
 #include "TreeModel.hh"
-#include "TreeItem.hh"
 
 //== NAMESPACES ===============================================================
 namespace VSI {
diff --git a/types/selectionWidget.cc b/types/selectionWidget.cc
index 9a308f6803286f268d8455f3796695ccec891233..0ca841c9bdc8789c0ade194b84f26e12e700c5fc 100644
--- a/types/selectionWidget.cc
+++ b/types/selectionWidget.cc
@@ -49,7 +49,6 @@
 
 //== INCLUDES =================================================================
 #include <QHBoxLayout>
-#include <QGridLayout>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QCheckBox>
diff --git a/vsiPlugin.cc b/vsiPlugin.cc
index 99e8636e1ed6ed4c4c7ecae87ba7566c89201d58..e3ade86b99671436d7ae10aeba95ca1354fde3e0 100644
--- a/vsiPlugin.cc
+++ b/vsiPlugin.cc
@@ -56,7 +56,6 @@
 //== INCLUDES =================================================================
 
 #include <QAction>
-#include <QIcon>
 #include <QScriptEngine>
 #include <QMessageBox>
 
@@ -68,7 +67,6 @@
 
 #include "baseWidget.hh"
 #include "parser/context.hh"
-#include "parser/element.hh"
 #include "parser/input.hh"
 #include "config/dynamicDialog.hh"