diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24f5939f..4f2a4a1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,9 @@ if(PythonQt_USE_VTK)
   find_package(VTK REQUIRED)
   include(${VTK_USE_FILE})
   add_definitions(-DPYTHONQT_USE_VTK)
-  if(${VTK_VERSION_MAJOR}.${VTK_VERSION_MINOR} VERSION_GREATER 5.6)
+  if(${VTK_VERSION_MAJOR} GREATER 5)
+    set(VTK_LIBRARIES vtkCommonCorePython)
+  elseif(${VTK_VERSION_MAJOR}.${VTK_VERSION_MINOR} VERSION_GREATER 5.6)
     set(VTK_LIBRARIES vtkPythonCore)
   else()
     set(VTK_LIBRARIES vtkCommonPythonD)
diff --git a/src/PythonQtStdDecorators.cpp b/src/PythonQtStdDecorators.cpp
index 1a42d516..6996bef6 100644
--- a/src/PythonQtStdDecorators.cpp
+++ b/src/PythonQtStdDecorators.cpp
@@ -126,15 +126,6 @@ bool PythonQtStdDecorators::disconnect(QObject* sender, const QByteArray& signal
   return r;
 }
 
-#undef emit
-void PythonQtStdDecorators::emit(QObject* sender, const QByteArray& signal, PyObject* arg1 ,PyObject* arg2 ,
-          PyObject* arg3 ,PyObject* arg4 ,PyObject* arg5 ,PyObject* arg6 ,PyObject* arg7 )
-{
-  // TODO xxx
-  // use normal PythonQtSlot calling code, add "allowSignal" to member lookup?!
-}
-#define emit
-
 QObject* PythonQtStdDecorators::parent(QObject* o) {
   return o->parent();
 }
diff --git a/src/PythonQtStdDecorators.h b/src/PythonQtStdDecorators.h
index 7fcbc832..30799456 100644
--- a/src/PythonQtStdDecorators.h
+++ b/src/PythonQtStdDecorators.h
@@ -61,11 +61,6 @@ public slots:
   bool connect(QObject* sender, const QByteArray& signal, QObject* receiver, const QByteArray& slot);
   bool disconnect(QObject* sender, const QByteArray& signal, PyObject* callable);
   bool disconnect(QObject* sender, const QByteArray& signal, QObject* receiver, const QByteArray& slot);
-
-#undef emit
-  void emit(QObject* sender, const QByteArray& signal, PyObject* arg1 = NULL,PyObject* arg2 = NULL,
-            PyObject* arg3 = NULL,PyObject* arg4 = NULL,PyObject* arg5 = NULL,PyObject* arg6 = NULL,PyObject* arg7 = NULL);
-#define emit
   
   QObject* parent(QObject* o);
   void setParent(QObject* o, QObject* parent);