Index: uspace/srv/fs/exfat/exfat_directory.c
===================================================================
--- uspace/srv/fs/exfat/exfat_directory.c	(revision 25a179efc4ecca45aa90793992b6c1c2743fd07f)
+++ uspace/srv/fs/exfat/exfat_directory.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -218,5 +218,6 @@
 	uint16_t wname[EXFAT_FILENAME_LEN + 1];
 	exfat_dentry_t *d = NULL;
-	int rc, i;
+	int rc;
+	int i;
 	size_t offset = 0;
 	aoff64_t start_pos = 0;
@@ -305,5 +306,6 @@
     exfat_stream_dentry_t *ds)
 {
-	int rc, i, count;
+	int rc;
+	int i, count;
 	exfat_dentry_t *array = NULL, *de;
 	aoff64_t pos = di->pos;
@@ -372,5 +374,6 @@
 	exfat_dentry_t df, ds, *de;
 	uint16_t wname[EXFAT_FILENAME_LEN + 1];
-	int rc, i;
+	int rc;
+	int i;
 	size_t uctable_chars, j;
 	aoff64_t pos;
@@ -473,5 +476,6 @@
 int exfat_directory_erase_file(exfat_directory_t *di, aoff64_t pos)
 {
-	int rc, count;
+	int rc;
+	int count;
 	exfat_dentry_t *de;
 
Index: uspace/srv/fs/mfs/mfs_inode.c
===================================================================
--- uspace/srv/fs/mfs/mfs_inode.c	(revision 25a179efc4ecca45aa90793992b6c1c2743fd07f)
+++ uspace/srv/fs/mfs/mfs_inode.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -83,5 +83,6 @@
 	struct mfs_sb_info *sbi;
 	block_t *b;
-	int i, r;
+	int i;
+	int r;
 
 	sbi = instance->sbi;
@@ -142,5 +143,6 @@
 	struct mfs_sb_info *sbi;
 	block_t *b;
-	int i, r;
+	int i;
+	int r;
 
 	ino_i = malloc(sizeof(*ino_i));
@@ -224,5 +226,6 @@
 mfs_write_inode_raw(struct mfs_node *mnode)
 {
-	int i, r;
+	int i;
+	int r;
 	block_t *b;
 	struct mfs_ino_info *ino_i = mnode->ino_i;
@@ -270,5 +273,6 @@
 	struct mfs_sb_info *sbi = mnode->instance->sbi;
 	block_t *b;
-	int i, r;
+	int i;
+	int r;
 
 	const uint32_t inum = ino_i->index - 1;
Index: uspace/srv/fs/mfs/mfs_rw.c
===================================================================
--- uspace/srv/fs/mfs/mfs_rw.c	(revision 25a179efc4ecca45aa90793992b6c1c2743fd07f)
+++ uspace/srv/fs/mfs/mfs_rw.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -244,5 +244,6 @@
 	struct mfs_sb_info *sbi = inst->sbi;
 	struct mfs_ino_info *ino_i = mnode->ino_i;
-	int nr_direct, ptrs_per_block, rblock, r;
+	int nr_direct, ptrs_per_block, rblock;
+	int r;
 	int i;