diff --git a/inc/ocf_volume.h b/inc/ocf_volume.h
index c8ec2cc..768884b 100644
--- a/inc/ocf_volume.h
+++ b/inc/ocf_volume.h
@@ -12,7 +12,7 @@
  */
 
 #include "ocf_types.h"
-#include "ocf_env.h"
+#include "ocf_env_headers.h"
 #include "ocf/ocf_err.h"
 
 struct ocf_io;
@@ -154,18 +154,7 @@ struct ocf_volume_properties {
  *
  * @return Zero when success, othewise error
  */
-static inline int ocf_uuid_set_str(ocf_uuid_t uuid, char *str)
-{
-	size_t len = env_strnlen(str, OCF_VOLUME_UUID_MAX_SIZE);
-
-	if (len >= OCF_VOLUME_UUID_MAX_SIZE)
-		return -OCF_ERR_INVAL;
-
-	uuid->data = str;
-	uuid->size = len + 1;
-
-	return 0;
-}
+int ocf_uuid_set_str(ocf_uuid_t uuid, char *str);
 
 /**
  * @brief Obtain string from UUID
diff --git a/src/ocf_volume.c b/src/ocf_volume.c
index 7536e23..bed3f26 100644
--- a/src/ocf_volume.c
+++ b/src/ocf_volume.c
@@ -9,6 +9,19 @@
 #include "ocf_io_priv.h"
 #include "ocf_env.h"
 
+int ocf_uuid_set_str(ocf_uuid_t uuid, char *str)
+{
+        size_t len = env_strnlen(str, OCF_VOLUME_UUID_MAX_SIZE);
+
+        if (len >= OCF_VOLUME_UUID_MAX_SIZE)
+                return -OCF_ERR_INVAL;
+
+        uuid->data = str;
+        uuid->size = len + 1;
+
+        return 0;
+}
+
 /* *** Bottom interface *** */
 
 /*
diff --git a/src/utils/utils_rbtree.h b/src/utils/utils_rbtree.h
index 61fcb34..bb6f542 100644
--- a/src/utils/utils_rbtree.h
+++ b/src/utils/utils_rbtree.h
@@ -6,7 +6,7 @@
 #ifndef __UTILS_RBTREE_H__
 #define __UTILS_RBTREE_H__
 
-#include "ocf/ocf.h"
+#include "../ocf_priv.h"
 
 struct ocf_rb_node {
 	bool red;