Index: uspace/app/trace/trace.c
===================================================================
--- uspace/app/trace/trace.c	(revision 06256b0a3c93945f18df24b2ee01c312d572f6c7)
+++ uspace/app/trace/trace.c	(revision b8dbe2f91bc390dbef003487ff02e2251b7472cc)
@@ -57,5 +57,4 @@
 #include "proto.h"
 #include <ipc/services.h>
-#include "../../srv/vfs/vfs.h"
 #include <ipc/console.h>
 
Index: uspace/lib/fs/libfs.c
===================================================================
--- uspace/lib/fs/libfs.c	(revision 06256b0a3c93945f18df24b2ee01c312d572f6c7)
+++ uspace/lib/fs/libfs.c	(revision b8dbe2f91bc390dbef003487ff02e2251b7472cc)
@@ -36,5 +36,4 @@
 
 #include "libfs.h"
-#include "../../srv/vfs/vfs.h"
 #include <macros.h>
 #include <errno.h>
@@ -46,4 +45,5 @@
 #include <sys/stat.h>
 #include <stdlib.h>
+#include <fibril_synch.h>
 
 #define on_error(rc, action) \
@@ -661,5 +661,5 @@
 			async_answer_5(rid, fs_handle, service_id,
 			    ops->index_get(cur), last, lsize,
-			    ops->is_directory(cur) ? VFS_NODE_DIRECTORY : VFS_NODE_FILE);
+			    ops->is_directory(cur));
 			LOG_EXIT(EOK);
 		} else {
@@ -707,5 +707,5 @@
 	if (!cur) {
 		async_answer_5(rid, fs_handle, service_id,
-			ops->index_get(par), last_next, -1, VFS_NODE_DIRECTORY);
+			ops->index_get(par), last_next, -1, true);
 		LOG_EXIT(EOK);
 		goto out;
@@ -729,5 +729,5 @@
 	async_answer_5(rid, fs_handle, service_id,
 		ops->index_get(cur), last, lsize,
-		ops->is_directory(cur) ? VFS_NODE_DIRECTORY : VFS_NODE_FILE);
+		ops->is_directory(cur));
 	
 	LOG_EXIT(EOK);