Index: uspace/srv/bd/hr/util.h
===================================================================
--- uspace/srv/bd/hr/util.h	(revision e0622a6d55bb82ba2dad9fdd676ff9468861c206)
+++ uspace/srv/bd/hr/util.h	(revision a62079d832da4d9a32352ac39c84e42c43dd1a0e)
@@ -45,13 +45,4 @@
 #include "var.h"
 
-struct dev_list_member {
-	link_t link;
-	service_id_t svc_id;
-	void *md;
-	bool inited;
-	bool md_present;
-	bool fini;
-};
-
 #define HR_DEBUG(format, ...) \
     log_msg(LOG_DEFAULT, LVL_DEBUG, format, ##__VA_ARGS__)
@@ -65,4 +56,24 @@
 #define HR_ERROR(format, ...) \
     log_msg(LOG_DEFAULT, LVL_ERROR, format, ##__VA_ARGS__)
+
+struct dev_list_member {
+	link_t link;
+	service_id_t svc_id;
+	void *md;
+	bool inited;
+	bool md_present;
+	bool fini;
+};
+
+typedef struct hr_range_lock {
+	link_t link;
+	fibril_mutex_t lock;
+	hr_volume_t *vol; /* back-pointer to volume */
+	uint64_t off; /* start of the range */
+	uint64_t len; /* length of the range */
+
+	size_t pending; /* prot. by vol->range_lock_list_lock */
+	bool ignore; /* prot. by vol->range_lock_list_lock */
+} hr_range_lock_t;
 
 extern errno_t hr_create_vol_struct(hr_volume_t **, hr_level_t, const char *,
Index: uspace/srv/bd/hr/var.h
===================================================================
--- uspace/srv/bd/hr/var.h	(revision e0622a6d55bb82ba2dad9fdd676ff9468861c206)
+++ uspace/srv/bd/hr/var.h	(revision a62079d832da4d9a32352ac39c84e42c43dd1a0e)
@@ -123,15 +123,4 @@
 #define	NO_STATE_CALLBACK false
 
-typedef struct hr_range_lock {
-	link_t link;
-	fibril_mutex_t lock;
-	hr_volume_t *vol; /* back-pointer to volume */
-	uint64_t off; /* start of the range */
-	uint64_t len; /* length of the range */
-
-	size_t pending; /* prot. by vol->range_lock_list_lock */
-	bool ignore; /* prot. by vol->range_lock_list_lock */
-} hr_range_lock_t;
-
 extern errno_t hr_raid0_create(hr_volume_t *);
 extern errno_t hr_raid1_create(hr_volume_t *);