Index: uspace/lib/display/include/types/display.h
===================================================================
--- uspace/lib/display/include/types/display.h	(revision 9901f267fac70e209d0629a3ceaef9c8a6e15fa6)
+++ uspace/lib/display/include/types/display.h	(revision 21099616041ffc6db275ee11d715218c75adc8b3)
@@ -46,17 +46,12 @@
 #define DISPLAY_DEFAULT NULL
 
+struct display;
+struct display_window;
+
 /** Display server session */
-typedef struct {
-	/** Session with display server */
-	async_sess_t *sess;
-	/** Synchronize access to display object */
-	fibril_mutex_t lock;
-	/** @c true if callback handler terminated */
-	bool cb_done;
-	/** Signalled when cb_done or ev_pending is changed */
-	fibril_condvar_t cv;
-	/** Windows (of display_window_t) */
-	list_t windows;
-} display_t;
+typedef struct display display_t;
+
+/** Display window */
+typedef struct display_window display_window_t;
 
 /** Display window callbacks */
@@ -76,18 +71,4 @@
 } display_wnd_cb_t;
 
-/** Display window */
-typedef struct {
-	/** Display associated with the window */
-	display_t *display;
-	/** Link to @c display->windows */
-	link_t lwindows;
-	/** Window ID */
-	sysarg_t id;
-	/** Callback functions */
-	display_wnd_cb_t *cb;
-	/** Argument to callback functions */
-	void *cb_arg;
-} display_window_t;
-
 #endif