Index: uspace/srv/fs/cdfs/cdfs_ops.c
===================================================================
--- uspace/srv/fs/cdfs/cdfs_ops.c	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/cdfs/cdfs_ops.c	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -44,5 +44,5 @@
 #include <libfs.h>
 #include <errno.h>
-#include <libblock.h>
+#include <block.h>
 #include <str.h>
 #include <byteorder.h>
Index: uspace/srv/fs/exfat/exfat_bitmap.c
===================================================================
--- uspace/srv/fs/exfat/exfat_bitmap.c	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/exfat/exfat_bitmap.c	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -39,5 +39,5 @@
 #include "../../vfs/vfs.h"
 #include <libfs.h>
-#include <libblock.h>
+#include <block.h>
 #include <errno.h>
 #include <byteorder.h>
Index: uspace/srv/fs/exfat/exfat_directory.c
===================================================================
--- uspace/srv/fs/exfat/exfat_directory.c	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/exfat/exfat_directory.c	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -39,5 +39,5 @@
 #include "exfat_directory.h"
 #include "exfat_fat.h"
-#include <libblock.h>
+#include <block.h>
 #include <errno.h>
 #include <byteorder.h>
Index: uspace/srv/fs/exfat/exfat_fat.c
===================================================================
--- uspace/srv/fs/exfat/exfat_fat.c	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/exfat/exfat_fat.c	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -42,5 +42,5 @@
 #include "../../vfs/vfs.h"
 #include <libfs.h>
-#include <libblock.h>
+#include <block.h>
 #include <errno.h>
 #include <byteorder.h>
Index: uspace/srv/fs/exfat/exfat_fat.h
===================================================================
--- uspace/srv/fs/exfat/exfat_fat.h	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/exfat/exfat_fat.h	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -37,5 +37,5 @@
 #include "../../vfs/vfs.h"
 #include <stdint.h>
-#include <libblock.h>
+#include <block.h>
 
 #define EXFAT_ROOT_IDX		0
Index: uspace/srv/fs/exfat/exfat_ops.c
===================================================================
--- uspace/srv/fs/exfat/exfat_ops.c	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/exfat/exfat_ops.c	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -45,5 +45,5 @@
 #include "../../vfs/vfs.h"
 #include <libfs.h>
-#include <libblock.h>
+#include <block.h>
 #include <ipc/services.h>
 #include <ipc/loc.h>
Index: uspace/srv/fs/ext2fs/ext2fs_ops.c
===================================================================
--- uspace/srv/fs/ext2fs/ext2fs_ops.c	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/ext2fs/ext2fs_ops.c	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -39,5 +39,5 @@
 #include "../../vfs/vfs.h"
 #include <libfs.h>
-#include <libblock.h>
+#include <block.h>
 #include <libext2.h>
 #include <ipc/services.h>
Index: uspace/srv/fs/fat/fat_directory.c
===================================================================
--- uspace/srv/fs/fat/fat_directory.c	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/fat/fat_directory.c	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -38,5 +38,5 @@
 #include "fat_directory.h"
 #include "fat_fat.h"
-#include <libblock.h>
+#include <block.h>
 #include <errno.h>
 #include <byteorder.h>
Index: uspace/srv/fs/fat/fat_fat.c
===================================================================
--- uspace/srv/fs/fat/fat_fat.c	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/fat/fat_fat.c	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -42,5 +42,5 @@
 #include "../../vfs/vfs.h"
 #include <libfs.h>
-#include <libblock.h>
+#include <block.h>
 #include <errno.h>
 #include <byteorder.h>
Index: uspace/srv/fs/fat/fat_fat.h
===================================================================
--- uspace/srv/fs/fat/fat_fat.h	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/fat/fat_fat.h	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -37,5 +37,5 @@
 #include "../../vfs/vfs.h"
 #include <stdint.h>
-#include <libblock.h>
+#include <block.h>
 
 #define FAT1		0
Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/fat/fat_ops.c	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -43,5 +43,5 @@
 #include "../../vfs/vfs.h"
 #include <libfs.h>
-#include <libblock.h>
+#include <block.h>
 #include <ipc/services.h>
 #include <ipc/loc.h>
Index: uspace/srv/fs/mfs/mfs.h
===================================================================
--- uspace/srv/fs/mfs/mfs.h	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/mfs/mfs.h	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -36,5 +36,5 @@
 #include <minix.h>
 #include <macros.h>
-#include <libblock.h>
+#include <block.h>
 #include <libfs.h>
 #include <adt/list.h>
Index: uspace/srv/fs/tmpfs/tmpfs_dump.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_dump.c	(revision 4802dd7d8d17cb02ec8f79547ffde538bb8c6736)
+++ uspace/srv/fs/tmpfs/tmpfs_dump.c	(revision dbf2ca4c8283c65135753fbf668b279e0b387c12)
@@ -44,5 +44,5 @@
 #include <sys/types.h>
 #include <as.h>
-#include <libblock.h>
+#include <block.h>
 #include <byteorder.h>