Index: uspace/app/edit/search_impl.h
===================================================================
--- uspace/app/edit/search_impl.h	(revision 445e7c04b5ad7b9ff7dd520d5a7a1b71f84bb3bd)
+++ uspace/app/edit/search_impl.h	(revision 55edba03c94a1f730602809a88e2bfb4b884c7ad)
@@ -40,5 +40,5 @@
 
 /** Search state */
-typedef struct search {
+struct search {
 	/* Note: This structure is opaque for the user. */
 
@@ -49,5 +49,5 @@
 	void *client_data;
 	search_ops_t ops;
-} search_t;
+};
 
 #endif
Index: uspace/app/edit/sheet_impl.h
===================================================================
--- uspace/app/edit/sheet_impl.h	(revision 445e7c04b5ad7b9ff7dd520d5a7a1b71f84bb3bd)
+++ uspace/app/edit/sheet_impl.h	(revision 55edba03c94a1f730602809a88e2bfb4b884c7ad)
@@ -40,5 +40,5 @@
 
 /** Sheet */
-typedef struct sheet {
+struct sheet {
 	/* Note: This structure is opaque for the user. */
 
@@ -48,5 +48,5 @@
 
 	list_t tags;
-} sheet_t;
+};
 
 #endif
Index: uspace/lib/c/include/bd_srv.h
===================================================================
--- uspace/lib/c/include/bd_srv.h	(revision 445e7c04b5ad7b9ff7dd520d5a7a1b71f84bb3bd)
+++ uspace/lib/c/include/bd_srv.h	(revision 55edba03c94a1f730602809a88e2bfb4b884c7ad)
@@ -57,5 +57,5 @@
 } bd_srv_t;
 
-typedef struct bd_ops {
+struct bd_ops {
 	int (*open)(bd_srvs_t *, bd_srv_t *);
 	int (*close)(bd_srv_t *);
@@ -65,5 +65,5 @@
 	int (*get_block_size)(bd_srv_t *, size_t *);
 	int (*get_num_blocks)(bd_srv_t *, aoff64_t *);
-} bd_ops_t;
+};
 
 extern void bd_srvs_init(bd_srvs_t *);
Index: uspace/lib/c/include/io/con_srv.h
===================================================================
--- uspace/lib/c/include/io/con_srv.h	(revision 445e7c04b5ad7b9ff7dd520d5a7a1b71f84bb3bd)
+++ uspace/lib/c/include/io/con_srv.h	(revision 55edba03c94a1f730602809a88e2bfb4b884c7ad)
@@ -66,5 +66,5 @@
 } con_srv_t;
 
-typedef struct con_ops {
+struct con_ops {
 	int (*open)(con_srvs_t *, con_srv_t *);
 	int (*close)(con_srv_t *);
@@ -83,5 +83,5 @@
 	void (*set_cursor_visibility)(con_srv_t *, bool);
 	int (*get_event)(con_srv_t *, cons_event_t *);
-} con_ops_t;
+};
 
 extern void con_srvs_init(con_srvs_t *);
Index: uspace/lib/draw/drawctx.h
===================================================================
--- uspace/lib/draw/drawctx.h	(revision 445e7c04b5ad7b9ff7dd520d5a7a1b71f84bb3bd)
+++ uspace/lib/draw/drawctx.h	(revision 55edba03c94a1f730602809a88e2bfb4b884c7ad)
@@ -47,5 +47,5 @@
 #include "font.h"
 
-typedef struct drawctx {
+struct drawctx {
 	link_t link;
 	list_t list;
@@ -62,5 +62,5 @@
 	sysarg_t clip_width;
 	sysarg_t clip_height;
-} drawctx_t;
+};
 
 extern void drawctx_init(drawctx_t *, surface_t *);
Index: uspace/lib/gui/connection.h
===================================================================
--- uspace/lib/gui/connection.h	(revision 445e7c04b5ad7b9ff7dd520d5a7a1b71f84bb3bd)
+++ 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 445e7c04b5ad7b9ff7dd520d5a7a1b71f84bb3bd)
+++ 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 445e7c04b5ad7b9ff7dd520d5a7a1b71f84bb3bd)
+++ 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;
+};
 
 /**
Index: uspace/srv/hid/isdv4_tablet/isdv4.h
===================================================================
--- uspace/srv/hid/isdv4_tablet/isdv4.h	(revision 445e7c04b5ad7b9ff7dd520d5a7a1b71f84bb3bd)
+++ uspace/srv/hid/isdv4_tablet/isdv4.h	(revision 55edba03c94a1f730602809a88e2bfb4b884c7ad)
@@ -76,5 +76,5 @@
 } isdv4_source_type_t;
 
-typedef struct isdv4_event {
+struct isdv4_event {
 	isdv4_event_type_t type;
 	isdv4_source_type_t source;
@@ -83,5 +83,5 @@
 	unsigned int pressure;
 	unsigned int button;
-} isdv4_event_t;
+};
 
 extern int isdv4_init(isdv4_state_t *, async_sess_t *, isdv4_event_fn);