Index: uspace/lib/block/block.c
===================================================================
--- uspace/lib/block/block.c	(revision 1c0cef08b9f78743c012e71181a38265e7dec433)
+++ uspace/lib/block/block.c	(revision b7adc2268d6532c011fd39106df4ecc5a7a6b0c8)
@@ -37,5 +37,4 @@
  */
 
-#include "../../srv/vfs/vfs.h"
 #include <ipc/loc.h>
 #include <ipc/services.h>
Index: uspace/lib/block/block.h
===================================================================
--- uspace/lib/block/block.h	(revision 1c0cef08b9f78743c012e71181a38265e7dec433)
+++ uspace/lib/block/block.h	(revision b7adc2268d6532c011fd39106df4ecc5a7a6b0c8)
@@ -29,7 +29,7 @@
  */
 
-/** @addtogroup libblock 
+/** @addtogroup libblock
  * @{
- */ 
+ */
 /**
  * @file
@@ -41,8 +41,8 @@
 #include <stdint.h>
 #include <async.h>
-#include "../../srv/vfs/vfs.h"
 #include <fibril_synch.h>
 #include <adt/hash_table.h>
 #include <adt/list.h>
+#include <loc.h>
 
 /*
@@ -50,5 +50,5 @@
  */
 
-/** 
+/**
  * This macro is a symbolic value for situations where no special flags are
  * needed.
Index: uspace/lib/ext4/libext4_filesystem.c
===================================================================
--- uspace/lib/ext4/libext4_filesystem.c	(revision 1c0cef08b9f78743c012e71181a38265e7dec433)
+++ uspace/lib/ext4/libext4_filesystem.c	(revision b7adc2268d6532c011fd39106df4ecc5a7a6b0c8)
@@ -39,4 +39,5 @@
 #include <errno.h>
 #include <malloc.h>
+#include <ipc/vfs.h>
 #include "libext4.h"