Index: uspace/lib/c/include/io/window.h
===================================================================
--- uspace/lib/c/include/io/window.h	(revision 84876aa4f80a43fe7bb9c01fbe376d900db1cbe4)
+++ uspace/lib/c/include/io/window.h	(revision 6feccae4e934741d247da783eb3bbef174d9d0ef)
@@ -36,9 +36,7 @@
 #define _LIBC_IO_WINDOW_H_
 
-#include <stdbool.h>
-#include <async.h>
-#include <loc.h>
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
+#include <types/common.h>
 
 typedef enum {
@@ -113,16 +111,4 @@
 } window_event_t;
 
-extern errno_t win_register(async_sess_t *, window_flags_t, service_id_t *,
-    service_id_t *);
-
-extern errno_t win_get_event(async_sess_t *, window_event_t *);
-
-extern errno_t win_damage(async_sess_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t);
-extern errno_t win_grab(async_sess_t *, sysarg_t, sysarg_t);
-extern errno_t win_resize(async_sess_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    window_placement_flags_t, void *);
-extern errno_t win_close(async_sess_t *);
-extern errno_t win_close_request(async_sess_t *);
-
 #endif