Index: uspace/drv/bus/isa/i8237.c
===================================================================
--- uspace/drv/bus/isa/i8237.c	(revision 8fdab9e68c7a3f5313aa3c59804d1ce45a0aa389)
+++ uspace/drv/bus/isa/i8237.c	(revision 1a374967997b33e560720544b0b126a5f689f6b3)
@@ -188,5 +188,5 @@
 } dma_controller_t;
 
-static fibril_mutex_t guard = FIBRIL_MUTEX_INITIALIZER(guard);
+static FIBRIL_MUTEX_INITIALIZE(guard);
 
 /** Standard i8237 DMA controller.
Index: uspace/lib/pcut/src/os/helenos.c
===================================================================
--- uspace/lib/pcut/src/os/helenos.c	(revision 8fdab9e68c7a3f5313aa3c59804d1ce45a0aa389)
+++ uspace/lib/pcut/src/os/helenos.c	(revision 1a374967997b33e560720544b0b126a5f689f6b3)
@@ -109,10 +109,8 @@
 
 /** Mutex guard for forced_termination_cv. */
-static fibril_mutex_t forced_termination_mutex
-	= FIBRIL_MUTEX_INITIALIZER(forced_termination_mutex);
+static FIBRIL_MUTEX_INITIALIZE(forced_termination_mutex);
 
 /** Condition-variable for checking whether test timed-out. */
-static fibril_condvar_t forced_termination_cv
-	= FIBRIL_CONDVAR_INITIALIZER(forced_termination_cv);
+static FIBRIL_CONDVAR_INITIALIZE(forced_termination_cv);
 
 /** Spawned task id. */