Index: uspace/srv/bd/hr/fge.c
===================================================================
--- uspace/srv/bd/hr/fge.c	(revision cff23429785237a4927c0e233f8e2d64a4490a69)
+++ uspace/srv/bd/hr/fge.c	(revision 81b4c79545567c0060aaff6312830eea7da3f6de)
@@ -140,5 +140,5 @@
 	assert(wu_cnt > 0);
 
-	hr_fgroup_t *result = malloc_waitok(sizeof(hr_fgroup_t));
+	hr_fgroup_t *result = hr_malloc_waitok(sizeof(hr_fgroup_t));
 
 	result->reserved_cnt = 0;
@@ -161,5 +161,6 @@
 		 */
 		size_t taking = parent->wu_storage_free_count;
-		result->own_mem = malloc_waitok(parent->wu_size * (wu_cnt - taking));
+		result->own_mem =
+		    hr_malloc_waitok(parent->wu_size * (wu_cnt - taking));
 		result->reserved_cnt = taking;
 		parent->wu_storage_free_count = 0;
@@ -168,5 +169,5 @@
 	if (result->reserved_cnt > 0) {
 		result->memslots =
-		    malloc_waitok(sizeof(size_t) * result->reserved_cnt);
+		    hr_malloc_waitok(sizeof(size_t) * result->reserved_cnt);
 	}
 
Index: uspace/srv/bd/hr/io.c
===================================================================
--- uspace/srv/bd/hr/io.c	(revision cff23429785237a4927c0e233f8e2d64a4490a69)
+++ uspace/srv/bd/hr/io.c	(revision 81b4c79545567c0060aaff6312830eea7da3f6de)
@@ -234,5 +234,5 @@
 	hr_extent_t *extents = (hr_extent_t *)&io->vol->extents;
 
-	uint8_t *data = malloc_waitok(io->cnt * io->vol->bsize);
+	uint8_t *data = hr_malloc_waitok(io->cnt * io->vol->bsize);
 
 	rc = hr_read_direct(extents[ext_idx].svc_id, io->ba, io->cnt, data);
@@ -280,5 +280,5 @@
 	hr_extent_t *extents = (hr_extent_t *)&io->vol->extents;
 
-	uint8_t *data = malloc_waitok(io->cnt * io->vol->bsize);
+	uint8_t *data = hr_malloc_waitok(io->cnt * io->vol->bsize);
 
 	rc = hr_write_direct(extents[ext_idx].svc_id, io->ba, io->cnt, data);
Index: uspace/srv/bd/hr/raid5.c
===================================================================
--- uspace/srv/bd/hr/raid5.c	(revision cff23429785237a4927c0e233f8e2d64a4490a69)
+++ uspace/srv/bd/hr/raid5.c	(revision 81b4c79545567c0060aaff6312830eea7da3f6de)
@@ -260,7 +260,7 @@
 	 * path.
 	 */
-	hr_range_lock_t **rlps = malloc_waitok(stripes_cnt * sizeof(*rlps));
+	hr_range_lock_t **rlps = hr_malloc_waitok(stripes_cnt * sizeof(*rlps));
 	for (size_t i = 0; i < stripes_cnt; i++)
-		rlps[i] = malloc_waitok(sizeof(**rlps));
+		rlps[i] = hr_malloc_waitok(sizeof(**rlps));
 
 	/*
@@ -474,7 +474,7 @@
 	 * path.
 	 */
-	hr_range_lock_t **rlps = malloc_waitok(stripes_cnt * sizeof(*rlps));
+	hr_range_lock_t **rlps = hr_malloc_waitok(stripes_cnt * sizeof(*rlps));
 	for (size_t i = 0; i < stripes_cnt; i++)
-		rlps[i] = malloc_waitok(sizeof(**rlps));
+		rlps[i] = hr_malloc_waitok(sizeof(**rlps));
 
 	/*
Index: uspace/srv/bd/hr/util.c
===================================================================
--- uspace/srv/bd/hr/util.c	(revision cff23429785237a4927c0e233f8e2d64a4490a69)
+++ uspace/srv/bd/hr/util.c	(revision 81b4c79545567c0060aaff6312830eea7da3f6de)
@@ -84,5 +84,5 @@
  * Return value is never NULL.
  */
-void *malloc_waitok(size_t size)
+void *hr_malloc_waitok(size_t size)
 {
 	void *ret;
@@ -93,5 +93,5 @@
 }
 
-void *calloc_waitok(size_t nmemb, size_t size)
+void *hr_calloc_waitok(size_t nmemb, size_t size)
 {
 	void *ret;
@@ -524,5 +524,5 @@
     uint64_t cnt)
 {
-	hr_range_lock_t *rl = malloc_waitok(sizeof(hr_range_lock_t));
+	hr_range_lock_t *rl = hr_malloc_waitok(sizeof(hr_range_lock_t));
 
 	return hr_range_lock_acquire_internal(rl, vol, ba, cnt);
Index: uspace/srv/bd/hr/util.h
===================================================================
--- uspace/srv/bd/hr/util.h	(revision cff23429785237a4927c0e233f8e2d64a4490a69)
+++ uspace/srv/bd/hr/util.h	(revision 81b4c79545567c0060aaff6312830eea7da3f6de)
@@ -77,8 +77,8 @@
 } hr_range_lock_t;
 
-extern void *malloc_waitok(size_t)
+extern void *hr_malloc_waitok(size_t)
     __attribute__((malloc));
 
-extern void *calloc_waitok(size_t, size_t)
+extern void *hr_calloc_waitok(size_t, size_t)
     __attribute__((malloc));