Index: uspace/srv/hid/display/client.c
===================================================================
--- uspace/srv/hid/display/client.c	(revision fd777a25b63bc4e2a12847a14ecca9cf36355a91)
+++ uspace/srv/hid/display/client.c	(revision 879d7245cbdc281f61fa2ce307ec595f296867ac)
@@ -113,5 +113,5 @@
 
 	/* Make sure window is no longer focused in any seat */
-	seat = ds_display_first_seat(wnd->client->display);
+	seat = ds_display_first_seat(wnd->display);
 	while (seat != NULL) {
 		ds_seat_evac_focus(seat, wnd);
Index: uspace/srv/hid/display/window.c
===================================================================
--- uspace/srv/hid/display/window.c	(revision fd777a25b63bc4e2a12847a14ecca9cf36355a91)
+++ uspace/srv/hid/display/window.c	(revision 879d7245cbdc281f61fa2ce307ec595f296867ac)
@@ -77,6 +77,6 @@
 	ds_window_t *wnd = (ds_window_t *) arg;
 
-	log_msg(LOG_DEFAULT, LVL_NOTE, "gc_set_color gc=%p", wnd->client->display->gc);
-	return gfx_set_color(wnd->client->display->gc, color);
+	log_msg(LOG_DEFAULT, LVL_NOTE, "gc_set_color gc=%p", wnd->display->gc);
+	return gfx_set_color(wnd->display->gc, color);
 }
 
@@ -95,5 +95,5 @@
 	log_msg(LOG_DEFAULT, LVL_NOTE, "gc_fill_rect");
 	gfx_rect_translate(&wnd->dpos, rect, &drect);
-	return gfx_fill_rect(wnd->client->display->gc, &drect);
+	return gfx_fill_rect(wnd->display->gc, &drect);
 }
 
@@ -117,5 +117,5 @@
 		return ENOMEM;
 
-	rc = gfx_bitmap_create(wnd->client->display->gc, params, alloc,
+	rc = gfx_bitmap_create(wnd->display->gc, params, alloc,
 	    &cbm->bitmap);
 	if (rc != EOK)