Index: uspace/lib/c/generic/vfs/vfs.c
===================================================================
--- uspace/lib/c/generic/vfs/vfs.c	(revision df024608bc71a5ba7342b52625eac7e314d816be)
+++ uspace/lib/c/generic/vfs/vfs.c	(revision 866e627983a4c2729536d3da7c79932dc4dc9f27)
@@ -69,5 +69,5 @@
  *
  */
-static async_exch_t *vfs_exchange_begin(void)
+async_exch_t *vfs_exchange_begin(void)
 {
 	fibril_mutex_lock(&vfs_mutex);
@@ -87,5 +87,5 @@
  *
  */
-static void vfs_exchange_end(async_exch_t *exch)
+void vfs_exchange_end(async_exch_t *exch)
 {
 	async_exchange_end(exch);
Index: uspace/lib/c/include/loader/loader.h
===================================================================
--- uspace/lib/c/include/loader/loader.h	(revision df024608bc71a5ba7342b52625eac7e314d816be)
+++ uspace/lib/c/include/loader/loader.h	(revision 866e627983a4c2729536d3da7c79932dc4dc9f27)
@@ -38,5 +38,6 @@
 
 #include <task.h>
-#include <vfs/vfs.h>
+
+typedef struct fdi_node fdi_node_t;
 
 /** Forward declararion */
Index: uspace/lib/c/include/task.h
===================================================================
--- uspace/lib/c/include/task.h	(revision df024608bc71a5ba7342b52625eac7e314d816be)
+++ uspace/lib/c/include/task.h	(revision 866e627983a4c2729536d3da7c79932dc4dc9f27)
@@ -37,5 +37,6 @@
 
 #include <sys/types.h>
-#include <vfs/vfs.h>
+
+typedef struct fdi_node fdi_node_t;
 
 typedef uint64_t task_id_t;
Index: uspace/lib/c/include/vfs/vfs.h
===================================================================
--- uspace/lib/c/include/vfs/vfs.h	(revision df024608bc71a5ba7342b52625eac7e314d816be)
+++ uspace/lib/c/include/vfs/vfs.h	(revision 866e627983a4c2729536d3da7c79932dc4dc9f27)
@@ -40,4 +40,5 @@
 #include <ipc/devmap.h>
 #include <stdio.h>
+#include <async.h>
 
 enum vfs_change_state_type {
@@ -51,5 +52,5 @@
  *
  */
-typedef struct {
+typedef struct fdi_node {
 	fs_handle_t fs_handle;
 	devmap_handle_t devmap_handle;
@@ -69,4 +70,7 @@
 extern int fnode(FILE *, fdi_node_t *);
 
+extern async_exch_t *vfs_exchange_begin(void);
+extern void vfs_exchange_end(async_exch_t *);
+
 #endif