diff --git a/unmanaged.cpp b/unmanaged.cpp
--- a/unmanaged.cpp
+++ b/unmanaged.cpp
@@ -56,7 +56,7 @@
 
 bool Unmanaged::track(xcb_window_t w)
 {
-    GRAB_SERVER_DURING_CONTEXT
+    XServerGrabber xserverGrabber;
     Xcb::WindowAttributes attr(w);
     Xcb::WindowGeometry geo(w);
     if (attr.isNull() || attr->map_state != XCB_MAP_STATE_VIEWABLE) {
diff --git a/utils.h b/utils.h
--- a/utils.h
+++ b/utils.h
@@ -151,8 +151,6 @@
  * Small helper class which performs grabXServer in the ctor and
  * ungrabXServer in the dtor. Use this class to ensure that grab and
  * ungrab are matched.
- *
- * To simplify usage consider using the macro GRAB_SERVER_DURING_CONTEXT
  */
 class XServerGrabber
 {
@@ -165,8 +163,6 @@
     }
 };
 
-#define GRAB_SERVER_DURING_CONTEXT XServerGrabber xserverGrabber;
-
 // the docs say it's UrgencyHint, but it's often #defined as XUrgencyHint
 #ifndef UrgencyHint
 #define UrgencyHint XUrgencyHint