Index: uspace/srv/fs/mfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/mfs/mfs_ops.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/srv/fs/mfs/mfs_ops.c	(revision c25a39e2128c1d1c14d7a9f13ab8a2fb58439aae)
@@ -825,4 +825,5 @@
 {
 	errno_t rc;
+	errno_t tmp;
 	fs_node_t *fn = NULL;
 
@@ -926,6 +927,5 @@
 	return rc;
 out_error:
-	;
-	errno_t tmp = mfs_node_put(fn);
+	tmp = mfs_node_put(fn);
 	async_answer_0(callid, tmp != EOK ? tmp : rc);
 	return tmp != EOK ? tmp : rc;
Index: uspace/srv/hid/rfb/rfb.h
===================================================================
--- uspace/srv/hid/rfb/rfb.h	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/srv/hid/rfb/rfb.h	(revision c25a39e2128c1d1c14d7a9f13ab8a2fb58439aae)
@@ -139,5 +139,5 @@
 	uint16_t first_color;
 	uint16_t color_count;
-} __attribute((packed)) rfb_set_color_map_entries_t;
+} __attribute__((packed)) rfb_set_color_map_entries_t;
 
 typedef struct {
Index: uspace/srv/net/slip/slip.c
===================================================================
--- uspace/srv/net/slip/slip.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/srv/net/slip/slip.c	(revision c25a39e2128c1d1c14d7a9f13ab8a2fb58439aae)
@@ -239,5 +239,6 @@
 
 	while (true) {
-		for (sdu.size = 0; sdu.size < sizeof(recv_final); /**/) {
+		sdu.size = 0;
+		while (sdu.size < sizeof(recv_final)) {
 			ch = read_buffered(chardev);
 			switch (ch) {
Index: uspace/srv/vfs/vfs.h
===================================================================
--- uspace/srv/vfs/vfs.h	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/srv/vfs/vfs.h	(revision c25a39e2128c1d1c14d7a9f13ab8a2fb58439aae)
@@ -60,28 +60,20 @@
 } fs_info_t;
 
-/**
- * VFS_PAIR uniquely represents a file system instance.
- */
-#define VFS_PAIR \
-	fs_handle_t fs_handle; \
+/** Uniquely represents a file system instance. */
+typedef struct {
+	fs_handle_t fs_handle;
 	service_id_t service_id;
-
-/**
- * VFS_TRIPLET uniquely identifies a file system node (e.g. directory, file) but
- * doesn't contain any state. For a stateful structure, see vfs_node_t.
+} vfs_pair_t;
+
+/** Uniquely identifies a file system node (e.g. directory, file)
+ * but doesn't contain any state. For a stateful structure, see vfs_node_t.
  *
  * @note	fs_handle, service_id and index are meant to be returned in one
  *		IPC reply.
  */
-#define VFS_TRIPLET \
-	VFS_PAIR; \
+typedef struct {
+	fs_handle_t fs_handle;
+	service_id_t service_id;
 	fs_index_t index;
-
-typedef struct {
-	VFS_PAIR;
-} vfs_pair_t;
-
-typedef struct {
-	VFS_TRIPLET;
 } vfs_triplet_t;
 
@@ -103,5 +95,11 @@
  */
 typedef struct _vfs_node {
-	VFS_TRIPLET;		/**< Identity of the node. */
+	/*
+	 * Identity of the node
+	 */
+
+	fs_handle_t fs_handle;
+	service_id_t service_id;
+	fs_index_t index;
 
 	/**