diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 75ea4f7b7..b62a18ee5 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -538,12 +538,12 @@ CreatePointerBarrierClient(ClientPtr client,
 static int
 BarrierFreeBarrier(void *data, XID id)
 {
-    struct PointerBarrierClient *barrier;
+    struct PointerBarrierClient *c;
 
-    barrier = container_of(data, struct PointerBarrierClient, barrier);
-    xorg_list_del(&barrier->entry);
+    c = container_of(data, struct PointerBarrierClient, barrier);
+    xorg_list_del(&c->entry);
 
-    free(barrier);
+    free(c);
     return Success;
 }