diff --git a/client.h b/client.h
index ef54a8eb7b..48626f2dc1 100644
--- a/client.h
+++ b/client.h
@@ -682,9 +682,9 @@ private:
     void focusOutEvent(XFocusOutEvent* e);
     virtual void damageNotifyEvent();
 
-    bool buttonPressEvent(Window w, int button, int state, int x, int y, int x_root, int y_root);
-    bool buttonReleaseEvent(Window w, int button, int state, int x, int y, int x_root, int y_root);
-    bool motionNotifyEvent(Window w, int state, int x, int y, int x_root, int y_root);
+    bool buttonPressEvent(xcb_window_t w, int button, int state, int x, int y, int x_root, int y_root);
+    bool buttonReleaseEvent(xcb_window_t w, int button, int state, int x, int y, int x_root, int y_root);
+    bool motionNotifyEvent(xcb_window_t w, int state, int x, int y, int x_root, int y_root);
     void checkQuickTilingMaximizationZones(int xroot, int yroot);
 
     bool processDecorationButtonPress(int button, int state, int x, int y, int x_root, int y_root,
diff --git a/events.cpp b/events.cpp
index 2b789f1a4c..713d2f3bce 100644
--- a/events.cpp
+++ b/events.cpp
@@ -960,7 +960,7 @@ static bool modKeyDown(int state) {
 
 
 // return value matters only when filtering events before decoration gets them
-bool Client::buttonPressEvent(Window w, int button, int state, int x, int y, int x_root, int y_root)
+bool Client::buttonPressEvent(xcb_window_t w, int button, int state, int x, int y, int x_root, int y_root)
 {
     if (buttonDown) {
         if (w == wrapperId())
@@ -1134,7 +1134,7 @@ void Client::processMousePressEvent(QMouseEvent* e)
 }
 
 // return value matters only when filtering events before decoration gets them
-bool Client::buttonReleaseEvent(Window w, int /*button*/, int state, int x, int y, int x_root, int y_root)
+bool Client::buttonReleaseEvent(xcb_window_t w, int /*button*/, int state, int x, int y, int x_root, int y_root)
 {
     if (w == decorationId() && !buttonDown)
         return false;
@@ -1226,7 +1226,7 @@ void Client::checkQuickTilingMaximizationZones(int xroot, int yroot)
 }
 
 // return value matters only when filtering events before decoration gets them
-bool Client::motionNotifyEvent(Window w, int state, int x, int y, int x_root, int y_root)
+bool Client::motionNotifyEvent(xcb_window_t w, int state, int x, int y, int x_root, int y_root)
 {
     if (w != frameId() && w != decorationId() && w != inputId() && w != moveResizeGrabWindow())
         return true; // care only about the whole frame