Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision ba2901865c3ab8afb4340d521a9d32f8d12af447)
@@ -215,5 +215,5 @@
 
 	if (tail != CAT_FULL_FILE) {
-		struct stat st;
+		vfs_stat_t st;
 
 		if (vfs_stat(fd, &st) != EOK) {
Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision ba2901865c3ab8afb4340d521a9d32f8d12af447)
@@ -80,5 +80,5 @@
 static dentry_type_t get_type(const char *path)
 {
-	struct stat s;
+	vfs_stat_t s;
 
 	errno_t r = vfs_stat_path(path, &s);
@@ -340,6 +340,6 @@
 		 */
 		while ((dp = readdir(dir))) {
-			struct stat src_s;
-			struct stat dest_s;
+			vfs_stat_t src_s;
+			vfs_stat_t dest_s;
 
 			char src_dent[PATH_MAX];
@@ -392,5 +392,5 @@
 	char *buff = NULL;
 	aoff64_t posr = 0, posw = 0;
-	struct stat st;
+	vfs_stat_t st;
 
 	if (vb)
Index: uspace/app/bdsh/cmds/modules/ls/ls.h
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.h	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
+++ uspace/app/bdsh/cmds/modules/ls/ls.h	(revision ba2901865c3ab8afb4340d521a9d32f8d12af447)
@@ -23,5 +23,5 @@
 struct dir_elem_t {
 	char *name;
-	struct stat s;
+	vfs_stat_t s;
 };
 
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision ba2901865c3ab8afb4340d521a9d32f8d12af447)
@@ -82,5 +82,5 @@
 	int longind;
 	bool no_create = false;
-	struct stat file_stat;
+	vfs_stat_t file_stat;
 	int fd = -1;
 	char *buff = NULL;
Index: uspace/app/bdsh/compl.c
===================================================================
--- uspace/app/bdsh/compl.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
+++ uspace/app/bdsh/compl.c	(revision ba2901865c3ab8afb4340d521a9d32f8d12af447)
@@ -360,5 +360,5 @@
 				char *ent_path;
 				asprintf(&ent_path, "%s/%s", *cs->path, dent->d_name);
-				struct stat ent_stat;
+				vfs_stat_t ent_stat;
 				if (vfs_stat_path(ent_path, &ent_stat) != EOK) {
 					/* Error */
Index: uspace/app/df/df.c
===================================================================
--- uspace/app/df/df.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
+++ uspace/app/df/df.c	(revision ba2901865c3ab8afb4340d521a9d32f8d12af447)
@@ -58,5 +58,5 @@
 static errno_t size_to_human_readable(uint64_t, size_t, char **);
 static void print_header(void);
-static errno_t print_statfs(struct statfs *, char *, char *);
+static errno_t print_statfs(vfs_statfs_t *, char *, char *);
 static void print_usage(void);
 
@@ -64,5 +64,5 @@
 {
 	int optres, errflg = 0;
-	struct statfs st;
+	vfs_statfs_t st;
 	errno_t rc;
 
@@ -147,5 +147,5 @@
 }
 
-static errno_t print_statfs(struct statfs *st, char *name, char *mountpoint)
+static errno_t print_statfs(vfs_statfs_t *st, char *name, char *mountpoint)
 {
 	uint64_t const used_blocks = st->f_blocks - st->f_bfree;
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
+++ uspace/app/init/init.c	(revision ba2901865c3ab8afb4340d521a9d32f8d12af447)
@@ -152,5 +152,5 @@
 static errno_t srv_startl(const char *path, ...)
 {
-	struct stat s;
+	vfs_stat_t s;
 	if (vfs_stat_path(path, &s) != EOK) {
 		printf("%s: Unable to stat %s\n", NAME, path);
Index: uspace/app/sysinst/futil.c
===================================================================
--- uspace/app/sysinst/futil.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
+++ uspace/app/sysinst/futil.c	(revision ba2901865c3ab8afb4340d521a9d32f8d12af447)
@@ -108,5 +108,5 @@
 	DIR *dir;
 	struct dirent *de;
-	struct stat s;
+	vfs_stat_t s;
 	char *srcp, *destp;
 	errno_t rc;
@@ -165,5 +165,5 @@
 	size_t fsize;
 	char *data;
-	struct stat st;
+	vfs_stat_t st;
 
 	rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
Index: uspace/app/viewer/viewer.c
===================================================================
--- uspace/app/viewer/viewer.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
+++ uspace/app/viewer/viewer.c	(revision ba2901865c3ab8afb4340d521a9d32f8d12af447)
@@ -115,5 +115,5 @@
 		return false;
 	
-	struct stat stat;
+	vfs_stat_t stat;
 	rc = vfs_stat(fd, &stat);
 	if (rc != EOK) {