diff --git a/client.h b/client.h
index 6bfe241360..70c2735d9b 100644
--- a/client.h
+++ b/client.h
@@ -674,7 +674,7 @@ private:
     // Handlers for X11 events
     bool mapRequestEvent(XMapRequestEvent* e);
     void unmapNotifyEvent(xcb_unmap_notify_event_t *e);
-    void destroyNotifyEvent(XDestroyWindowEvent* e);
+    void destroyNotifyEvent(xcb_destroy_notify_event_t *e);
     void configureRequestEvent(XConfigureRequestEvent* e);
     virtual void propertyNotifyEvent(xcb_property_notify_event_t *e) override;
     void clientMessageEvent(XClientMessageEvent* e);
diff --git a/events.cpp b/events.cpp
index 8bac885b7e..7c68ff8372 100644
--- a/events.cpp
+++ b/events.cpp
@@ -497,10 +497,10 @@ bool Client::windowEvent(xcb_generic_event_t *e)
     case XCB_UNMAP_NOTIFY:
         unmapNotifyEvent(reinterpret_cast<xcb_unmap_notify_event_t*>(e));
         break;
-#if KWIN_QT5_PORTING
-    case DestroyNotify:
-        destroyNotifyEvent(&e->xdestroywindow);
+    case XCB_DESTROY_NOTIFY:
+        destroyNotifyEvent(reinterpret_cast<xcb_destroy_notify_event_t*>(e));
         break;
+#if KWIN_QT5_PORTING
     case MapRequest:
         // this one may pass the event to workspace
         return mapRequestEvent(&e->xmaprequest);
@@ -652,7 +652,7 @@ void Client::unmapNotifyEvent(xcb_unmap_notify_event_t *e)
     }
 }
 
-void Client::destroyNotifyEvent(XDestroyWindowEvent* e)
+void Client::destroyNotifyEvent(xcb_destroy_notify_event_t *e)
 {
     if (e->window != window())
         return;