Index: uspace/lib/c/include/fibril_synch.h
===================================================================
--- uspace/lib/c/include/fibril_synch.h	(revision c1b979a5a2332e971f29013cd230bf1a1c6f35d4)
+++ uspace/lib/c/include/fibril_synch.h	(revision fc6abbe64a96e30234c9851b406ccecb9f607b09)
@@ -131,7 +131,9 @@
 typedef struct {
 	fibril_mutex_t lock;
+	fibril_mutex_t *lockp;
 	fibril_condvar_t cv;
 	fid_t fibril;
 	fibril_timer_state_t state;
+	bool handler_running;
 
 	suseconds_t delay;
@@ -162,9 +164,12 @@
 extern void fibril_condvar_broadcast(fibril_condvar_t *);
 
-extern fibril_timer_t *fibril_timer_create(void);
+extern fibril_timer_t *fibril_timer_create(fibril_mutex_t *);
 extern void fibril_timer_destroy(fibril_timer_t *);
 extern void fibril_timer_set(fibril_timer_t *, suseconds_t, fibril_timer_fun_t,
     void *);
+extern void fibril_timer_set_locked(fibril_timer_t *, suseconds_t,
+    fibril_timer_fun_t, void *);
 extern fibril_timer_state_t fibril_timer_clear(fibril_timer_t *);
+extern fibril_timer_state_t fibril_timer_clear_locked(fibril_timer_t *);
 
 #endif