diff --git a/MultiObjectPropertyModel.cc b/MultiObjectPropertyModel.cc
index b5d9b26b7d089b752a66c4ba32fb70a98679f33f..bf60a98764dc68e02fcbdaef398957831660b4c9 100644
--- a/MultiObjectPropertyModel.cc
+++ b/MultiObjectPropertyModel.cc
@@ -52,9 +52,6 @@
 #include "PropertyModelFactory.hh"
 #include "OpenMesh/OMPropertyModel.hh"
 #include "OpenVolumeMesh/OVMPropertyModel.hh"
-#include "OpenVolumeMesh/Mesh/HexahedralMesh.hh"
-
-#include "Utils.hh"
 
 MultiObjectPropertyModel::MultiObjectPropertyModel(const QStringList& res, QObject *parent) :
     PropertyModel(parent), restriction(res), datatypes(supportedDataTypes()), widget(0)
diff --git a/ObjectListItemModel.cc b/ObjectListItemModel.cc
index 4c8151c5a1f96cb97160a7b26dbd6f9a783aa640..a1d131b828f746278134629be38de96cf4f8077e 100644
--- a/ObjectListItemModel.cc
+++ b/ObjectListItemModel.cc
@@ -49,8 +49,6 @@
 
 #include "ObjectListItemModel.hh"
 
-#include <algorithm>
-
 #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
 
 ObjectListItemModel::ObjectListItemModel() {
diff --git a/PropertyModelFactory.cc b/PropertyModelFactory.cc
index 8ab928ca9c15723df2f9f6bd46c27c441737422c..837c25960dc90bda718aca04bcf540f300ffe5f9 100644
--- a/PropertyModelFactory.cc
+++ b/PropertyModelFactory.cc
@@ -49,23 +49,17 @@
 
 #include "PropertyModelFactory.hh"
 
-#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
-
 #include "MultiObjectPropertyModel.hh"
 #include "OpenMesh/OMPropertyModel.hh"
-#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
-#include <ObjectTypes/PolyMesh/PolyMesh.hh>
 
 #ifdef ENABLE_OPENVOLUMEMESH_SUPPORT
     #include "OpenVolumeMesh/OVMPropertyModel.hh"
 #endif /* ENABLE_OPENVOLUMEMESH_SUPPORT */
 
 #ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
-    #include <ObjectTypes/PolyhedralMesh/PolyhedralMesh.hh>
 #endif /* ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT */
 
 #ifdef ENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT
-    #include <ObjectTypes/HexahedralMesh/HexahedralMesh.hh>
 #endif /* ENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT */
 
 #ifdef ENABLE_OPENVOLUMEMESH_TETRAHEDRAL_SUPPORT
diff --git a/PropertyNameListModel.cc b/PropertyNameListModel.cc
index b7e0509d5e1ca6acc25f9f1a9ae6b6c4f26d91bd..3759caa7f0ae72151fe4e95e01d8d876c5ce5370 100644
--- a/PropertyNameListModel.cc
+++ b/PropertyNameListModel.cc
@@ -52,9 +52,7 @@
 #include <OpenMesh/Core/Utils/Property.hh>
 #include <ACG/Math/VectorT.hh>
 
-#include <map>
 #include <iostream>
-#include <vector>
 
 const PropertyNameListModel::TypeInfoWrapper PropertyNameListModel::proptype_bool =
         PropertyNameListModel::TypeInfoWrapper(typeid(OpenMesh::PropertyT<bool>), "bool");
diff --git a/PropertyVisPlugin.cc b/PropertyVisPlugin.cc
index e474b79a4db5f4e3c8b498a3c683ca9ee7e4254f..b1f42c6c29577bd1fac81e6df331994cd60e72af 100644
--- a/PropertyVisPlugin.cc
+++ b/PropertyVisPlugin.cc
@@ -57,24 +57,8 @@
 
 #include "PropertyVisPlugin.hh"
 
-#include <Qt>
-
-#include <QSpacerItem>
-#include <QFileDialog>
-
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <cmath>
-
-#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
-#include <ACG/Utils/ColorCoder.hh>
-
 #include "PropertyModelFactory.hh"
 
-#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
-#include <ObjectTypes/PolyMesh/PolyMesh.hh>
-
 #ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
     #include <ObjectTypes/PolyhedralMesh/PolyhedralMesh.hh>
 #endif
diff --git a/PropertyVisualizer.cc b/PropertyVisualizer.cc
index 60a4814b69c7fe4d6e3a5d97ea0c56c6f047bd76..5f320b13ff8edf851a8537d640f3e767b3faa46c 100644
--- a/PropertyVisualizer.cc
+++ b/PropertyVisualizer.cc
@@ -49,10 +49,6 @@
 
 #include "PropertyVisualizer.hh"
 
-#include <iostream>
-
-#include <QStringList>
-
 /*! \brief Visualizes the property
  *
  * This method should be implemented by a subclass that specializes on visualizing
diff --git a/SingleObjectPropertyModel.cc b/SingleObjectPropertyModel.cc
index 572e91d57427cdab186c3cf2ab6cdd08831a7854..b5c84ec4d6173152f874827029af402aa85c795a 100644
--- a/SingleObjectPropertyModel.cc
+++ b/SingleObjectPropertyModel.cc
@@ -49,8 +49,6 @@
 
 #include "SingleObjectPropertyModel.hh"
 
-#include <algorithm>
-
 SingleObjectPropertyModel::SingleObjectPropertyModel(QObject *parent)
     : PropertyModel(parent),
       widgets(0),