Index: uspace/srv/fs/fat/fat_fat.c
===================================================================
--- uspace/srv/fs/fat/fat_fat.c	(revision 4bf68955193cc391b927247a30e1bd1a64901d4f)
+++ uspace/srv/fs/fat/fat_fat.c	(revision 7ece4247321da5929bedba5f4bc3477242c68586)
@@ -289,5 +289,5 @@
  * @return		EOK or a negative error code.
  */
-int
+static int
 fat_get_cluster_fat12(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t *value)
@@ -359,5 +359,5 @@
  * @return		EOK or a negative error code.
  */
-int
+static int
 fat_get_cluster_fat16(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t *value)
@@ -390,5 +390,5 @@
  * @return		EOK or a negative error code.
  */
-int
+static int
 fat_get_cluster_fat32(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t *value)
@@ -451,5 +451,5 @@
  * @return		EOK on success or a negative error code.
  */
-int
+static int
 fat_set_cluster_fat12(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t value)
@@ -494,6 +494,5 @@
 			return ERANGE;
 		}
-	}
-	else
+	} else
 		byte2 = ((uint8_t*) b->data)[(offset % BPS(bs)) + 1];
 
@@ -540,5 +539,5 @@
  * @return		EOK on success or a negative error code.
  */
-int
+static int
 fat_set_cluster_fat16(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t value)
@@ -573,5 +572,5 @@
  * @return		EOK on success or a negative error code.
  */
-int
+static int
 fat_set_cluster_fat32(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t value)
Index: uspace/srv/fs/fat/fat_fat.h
===================================================================
--- uspace/srv/fs/fat/fat_fat.h	(revision 4bf68955193cc391b927247a30e1bd1a64901d4f)
+++ uspace/srv/fs/fat/fat_fat.h	(revision 7ece4247321da5929bedba5f4bc3477242c68586)
@@ -125,18 +125,6 @@
 extern int fat_alloc_shadow_clusters(struct fat_bs *, service_id_t,
     fat_cluster_t *, unsigned);
-extern int fat_get_cluster_fat12(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t *);
-extern int fat_get_cluster_fat16(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t *);
-extern int fat_get_cluster_fat32(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t *);
 extern int fat_get_cluster(struct fat_bs *, service_id_t, unsigned,
     fat_cluster_t, fat_cluster_t *);
-extern int fat_set_cluster_fat12(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t);
-extern int fat_set_cluster_fat16(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t);
-extern int fat_set_cluster_fat32(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t);
 extern int fat_set_cluster(struct fat_bs *, service_id_t, unsigned,
     fat_cluster_t, fat_cluster_t);
Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision 4bf68955193cc391b927247a30e1bd1a64901d4f)
+++ uspace/srv/fs/fat/fat_ops.c	(revision 7ece4247321da5929bedba5f4bc3477242c68586)
@@ -315,6 +315,5 @@
 		nodep->firstc = uint16_t_le2host(d->firstc_lo) | 
 		    (uint16_t_le2host(d->firstc_hi) << 16);
-	} 
-	else
+	} else
 		nodep->firstc = uint16_t_le2host(d->firstc);
 
@@ -333,5 +332,6 @@
 		 */
 		uint32_t clusters;
-		rc = fat_clusters_get(&clusters, bs, idxp->service_id, nodep->firstc);
+		rc = fat_clusters_get(&clusters, bs, idxp->service_id,
+		    nodep->firstc);
 		if (rc != EOK) {
 			(void) block_put(b);
@@ -392,7 +392,8 @@
 			/* hit */
 			fat_node_t *nodep;
-			aoff64_t o = di.pos % (BPS(di.bs) / sizeof(fat_dentry_t));
+			aoff64_t o = di.pos %
+			    (BPS(di.bs) / sizeof(fat_dentry_t));
 			fat_idx_t *idx = fat_idx_get_by_pos(service_id,
-				parentp->firstc, di.bnum * DPS(di.bs) + o);
+			    parentp->firstc, di.bnum * DPS(di.bs) + o);
 			if (!idx) {
 				/*
@@ -615,8 +616,8 @@
 
 	rc = fat_directory_write(&di, name, &de);
-	if (rc!=EOK)
+	if (rc != EOK)
 		return rc;
 	rc = fat_directory_close(&di);
-	if (rc!=EOK)
+	if (rc != EOK)
 		return rc;
 
@@ -713,5 +714,5 @@
 	
 	fat_directory_t di;
-	rc = fat_directory_open(parentp,&di);
+	rc = fat_directory_open(parentp, &di);
 	if (rc != EOK)
 		goto error;
@@ -1089,5 +1090,6 @@
 		fat_directory_t di;
 		rc = fat_directory_open(nodep, &di);
-		if (rc != EOK) goto err;
+		if (rc != EOK)
+			goto err;
 		rc = fat_directory_seek(&di, pos);
 		if (rc != EOK) {
@@ -1097,6 +1099,8 @@
 
 		rc = fat_directory_read(&di, name, &d);
-		if (rc == EOK) goto hit;
-		if (rc == ENOENT) goto miss;
+		if (rc == EOK)
+			goto hit;
+		if (rc == ENOENT)
+			goto miss;
 
 err:
@@ -1107,5 +1111,5 @@
 miss:
 		rc = fat_directory_close(&di);
-		if (rc!=EOK)
+		if (rc != EOK)
 			goto err;
 		rc = fat_node_put(fn);
@@ -1117,8 +1121,9 @@
 		pos = di.pos;
 		rc = fat_directory_close(&di);
-		if (rc!=EOK)
+		if (rc != EOK)
 			goto err;
-		(void) async_data_read_finalize(callid, name, str_size(name) + 1);
-		bytes = (pos - spos)+1;
+		(void) async_data_read_finalize(callid, name,
+		    str_size(name) + 1);
+		bytes = (pos - spos) + 1;
 	}