Index: uspace/lib/gui/connection.h
===================================================================
--- uspace/lib/gui/connection.h	(revision 21eeb653ff68913d2cffadcf7ed07f2b3a14eef1)
+++ uspace/lib/gui/connection.h	(revision 55edba03c94a1f730602809a88e2bfb4b884c7ad)
@@ -38,7 +38,5 @@
 
 #include <sys/types.h>
-
-struct widget;
-typedef struct widget widget_t;
+#include "widget.h"
 
 typedef sysarg_t signal_t;
Index: uspace/lib/gui/widget.h
===================================================================
--- uspace/lib/gui/widget.h	(revision 21eeb653ff68913d2cffadcf7ed07f2b3a14eef1)
+++ uspace/lib/gui/widget.h	(revision 55edba03c94a1f730602809a88e2bfb4b884c7ad)
@@ -51,5 +51,5 @@
  * any derived widget structure.
  */
-typedef struct widget {
+struct widget {
 	link_t link;
 	widget_t *parent; /**< Parent widget of this widget. NULL for root widget. */
@@ -116,5 +116,5 @@
 	 * also acquire or release mouse grab. */
 	void (*handle_position_event)(widget_t *, pos_event_t);
-} widget_t;
+};
 
 /*
Index: uspace/lib/gui/window.h
===================================================================
--- uspace/lib/gui/window.h	(revision 21eeb653ff68913d2cffadcf7ed07f2b3a14eef1)
+++ uspace/lib/gui/window.h	(revision 55edba03c94a1f730602809a88e2bfb4b884c7ad)
@@ -47,5 +47,5 @@
 #include "widget.h"
 
-typedef struct window {
+struct window {
 	bool is_main; /**< True for the main window of the application. */
 	bool is_decorated; /**< True if the window decorations should be rendered. */
@@ -60,5 +60,5 @@
 	fibril_mutex_t guard; /**< Mutex guarding window surface. */
 	surface_t *surface; /**< Window surface shared with compositor. */
-} window_t;
+};
 
 /**