Index: boot/genarch/src/ofw_tree.c
===================================================================
--- boot/genarch/src/ofw_tree.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ boot/genarch/src/ofw_tree.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -110,5 +110,7 @@
 		/* Find last slash */
 		size_t i;
-		for (i = len; (i > 0) && (path[i - 1] != '/'); i--);
+		i = len;
+		while (i > 0 && path[i - 1] != '/')
+			i--;
 
 		/* Do not include the slash */
Index: boot/generic/src/printf_core.c
===================================================================
--- boot/generic/src/printf_core.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ boot/generic/src/printf_core.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -670,5 +670,5 @@
 				counter += retval;
 				j = nxt;
-				goto next_char;
+				continue;
 			case 'c':
 				retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
@@ -677,9 +677,9 @@
 					counter = -counter;
 					goto out;
-				};
+				}
 
 				counter += retval;
 				j = nxt;
-				goto next_char;
+				continue;
 
 			/*
@@ -718,5 +718,5 @@
 			case '%':
 				j = i;
-				goto next_char;
+				continue;
 
 			/*
@@ -728,5 +728,5 @@
 				 * so we will print whole bad format sequence.
 				 */
-				goto next_char;
+				continue;
 			}
 
@@ -784,6 +784,4 @@
 			j = nxt;
 		}
-next_char:
-		;
 	}
 
Index: kernel/arch/mips32/src/cpu/cpu.c
===================================================================
--- kernel/arch/mips32/src/cpu/cpu.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ kernel/arch/mips32/src/cpu/cpu.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -109,5 +109,7 @@
 	if (m->arch.imp_num & 0x80) {
 		/* Count records */
-		for (i = 0; imp_data80[i].vendor; i++);
+		i = 0;
+		while (imp_data80[i].vendor)
+			i++;
 		if ((m->arch.imp_num & 0x7f) >= i) {
 			printf("imp=%d\n", m->arch.imp_num);
@@ -116,5 +118,7 @@
 		data = &imp_data80[m->arch.imp_num & 0x7f];
 	} else {
-		for (i = 0; imp_data[i].vendor; i++);
+		i = 0;
+		while (imp_data[i].vendor)
+			i++;
 		if (m->arch.imp_num >= i) {
 			printf("imp=%d\n", m->arch.imp_num);
Index: kernel/arch/mips32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/mips32/src/debug/stacktrace.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ kernel/arch/mips32/src/debug/stacktrace.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -159,6 +159,8 @@
 
 			/* Seek to the end of this function. */
-			for (cur = inst + 1; !IS_JR_RA(*cur); cur++)
-				;
+			cur = inst + 1;
+			while (!IS_JR_RA(*cur))
+				cur++;
+
 			/* Scan the last basic block */
 			for (cur--; !is_jump(*(cur - 1)); cur--) {
Index: kernel/genarch/src/ofw/ofw_tree.c
===================================================================
--- kernel/genarch/src/ofw/ofw_tree.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ kernel/genarch/src/ofw/ofw_tree.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -251,5 +251,7 @@
 
 	for (size_t i = 1; (i < str_size(path)) && (node); i = j + 1) {
-		for (j = i; (j < str_size(path)) && (path[j] != '/'); j++);
+		j = i;
+		while (j < str_size(path) && path[j] != '/')
+			j++;
 
 		/* Skip extra slashes */
Index: kernel/generic/src/adt/avl.c
===================================================================
--- kernel/generic/src/adt/avl.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ kernel/generic/src/adt/avl.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -412,6 +412,7 @@
 		 * node.
 		 */
-		for (cur = node->lft; cur->rgt != NULL; cur = cur->rgt)
-			;
+		cur = node->lft;
+		while (cur->rgt != NULL)
+			cur = cur->rgt;
 
 		if (cur != node->lft) {
@@ -462,5 +463,5 @@
 	 * cut-off node up to the root.
 	 */
-	for (;;) {
+	while (true) {
 		if (dir == LEFT) {
 			/*
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ kernel/generic/src/console/kconsole.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -264,8 +264,9 @@
 			}
 
-			for (max_match_len_tmp = 0;
-			    (output[max_match_len_tmp] ==
+			max_match_len_tmp = 0;
+			while ((output[max_match_len_tmp] ==
 			    hint[max_match_len_tmp]) &&
-			    (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
+			    (max_match_len_tmp < max_match_len))
+				++max_match_len_tmp;
 
 			max_match_len = max_match_len_tmp;
@@ -373,7 +374,7 @@
 				beg = 0;
 			} else {
-				for (beg = position - 1;
-				    (beg > 0) && (!isspace(current[beg]));
-				    beg--);
+				beg = position - 1;
+				while ((beg > 0) && (!isspace(current[beg])))
+				    beg--;
 
 				if (isspace(current[beg]))
Index: uspace/app/mkexfat/mkexfat.c
===================================================================
--- uspace/app/mkexfat/mkexfat.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/app/mkexfat/mkexfat.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -680,5 +680,7 @@
 	unsigned r;
 
-	for (r = 0;n >> r != 1; ++r);
+	r = 0;
+	while (n >> r != 1)
+		++r;
 
 	return r;
@@ -771,5 +773,8 @@
 	cfg.label = NULL;
 
-	for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+	c = 0;
+	optind = 0;
+	opt_ind = 0;
+	while (c != -1) {
 		c = getopt_long(argc, argv, "hs:c:L:",
 		    long_options, &opt_ind);
@@ -845,5 +850,5 @@
 
 	if (cfg.sector_size > 4096) {
-		printf(NAME ": Error, sector size can't be greater" \
+		printf(NAME ": Error, sector size can't be greater"
 		    " than 4096 bytes.\n");
 		return 2;
@@ -852,9 +857,9 @@
 	rc = block_get_nblocks(service_id, &cfg.volume_count);
 	if (rc != EOK) {
-		printf(NAME ": Warning, failed to obtain" \
+		printf(NAME ": Warning, failed to obtain"
 		    " block device size.\n");
 
 		if (user_fs_size == 0) {
-			printf(NAME ": You must specify the" \
+			printf(NAME ": You must specify the"
 			    " filesystem size.\n");
 			return 1;
@@ -897,5 +902,5 @@
 	    div_round_up(cfg.bitmap_size, cfg.cluster_size));
 	if (rc != EOK) {
-		printf(NAME ": Error, failed to allocate" \
+		printf(NAME ": Error, failed to allocate"
 		    " clusters for bitmap.\n");
 		return 2;
@@ -910,5 +915,5 @@
 	    div_round_up(sizeof(upcase_table), cfg.cluster_size));
 	if (rc != EOK) {
-		printf(NAME ":Error, failed to allocate clusters" \
+		printf(NAME ":Error, failed to allocate clusters"
 		    " for the upcase table.\n");
 		return 2;
@@ -921,5 +926,5 @@
 	rc = fat_allocate_clusters(service_id, &cfg, next_cls, 1);
 	if (rc != EOK) {
-		printf(NAME ": Error, failed to allocate cluster" \
+		printf(NAME ": Error, failed to allocate cluster"
 		    " for the root dentry.\n");
 		return 2;
@@ -931,5 +936,5 @@
 	rc = bitmap_write(service_id, &cfg);
 	if (rc != EOK) {
-		printf(NAME ": Error, failed to write the allocation" \
+		printf(NAME ": Error, failed to write the allocation"
 		    " bitmap to disk.\n");
 		return 2;
@@ -941,5 +946,5 @@
 	rc = upcase_table_write(service_id, &cfg);
 	if (rc != EOK) {
-		printf(NAME ": Error, failed to write the" \
+		printf(NAME ": Error, failed to write the"
 		    " upcase table to disk.\n");
 		return 2;
@@ -950,5 +955,5 @@
 	rc = root_dentries_write(service_id, &cfg);
 	if (rc != EOK) {
-		printf(NAME ": Error, failed to write the root directory" \
+		printf(NAME ": Error, failed to write the root directory"
 		    " entries to disk.\n");
 		return 2;
Index: uspace/app/mkfat/fat.h
===================================================================
--- uspace/app/mkfat/fat.h	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/app/mkfat/fat.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -117,5 +117,5 @@
 			/** Signature. */
 			uint16_t	signature;
-		} fat32 __attribute__ ((packed));
+		} __attribute__ ((packed)) fat32;
 	};
 } __attribute__ ((packed)) fat_bs_t;
Index: uspace/app/mkmfs/mkmfs.c
===================================================================
--- uspace/app/mkmfs/mkmfs.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/app/mkmfs/mkmfs.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -133,5 +133,8 @@
 	}
 
-	for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+	c = 0;
+	optind = 0;
+	opt_ind = 0;
+	while (c != -1) {
 		c = getopt_long(argc, argv, "lh12b:i:",
 		    long_options, &opt_ind);
@@ -566,5 +569,5 @@
 	errno_t rc;
 
-	sb = malloc(MFS_SUPERBLOCK_SIZE);;
+	sb = malloc(MFS_SUPERBLOCK_SIZE);
 
 	if (!sb)
Index: uspace/app/tester/chardev/chardev1.c
===================================================================
--- uspace/app/tester/chardev/chardev1.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/app/tester/chardev/chardev1.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -210,4 +210,4 @@
 		return s;
 
-	return test_chardev1_partialx();;
-}
+	return test_chardev1_partialx();
+}
Index: uspace/app/tetris/tetris.c
===================================================================
--- uspace/app/tetris/tetris.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/app/tetris/tetris.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -116,5 +116,6 @@
 		base = i * B_COLS + 1;
 		p = &board[base];
-		for (j = B_COLS - 2; *p++ != 0;) {
+		j = B_COLS - 2;
+		while (*p++ != 0) {
 			if (--j <= 0) {
 				/* This row is to be elided */
Index: uspace/app/tmon/tests.c
===================================================================
--- uspace/app/tmon/tests.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/app/tmon/tests.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -81,5 +81,8 @@
 	int c;
 	uint32_t duration_uint;
-	for (c = 0, optreset = 1, optind = 0; c != -1;) {
+	c = 0;
+	optreset = 1;
+	optind = 0;
+	while (c != -1) {
 		c = getopt_long(argc, argv, short_options, long_options, NULL);
 		switch (c) {
Index: uspace/dist/src/c/demos/tetris/tetris.c
===================================================================
--- uspace/dist/src/c/demos/tetris/tetris.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/dist/src/c/demos/tetris/tetris.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -117,5 +117,6 @@
 		base = i * B_COLS + 1;
 		p = &board[base];
-		for (j = B_COLS - 2; *p++ != 0;) {
+		j = B_COLS - 2;
+		while (*p++ != 0) {
 			if (--j <= 0) {
 				/* This row is to be elided */
Index: uspace/drv/bus/usb/ehci/ehci_rh.c
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_rh.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/drv/bus/usb/ehci/ehci_rh.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -339,5 +339,5 @@
 	    USB_PORTSC_PORT_RESET_FLAG) {
 		async_usleep(1);
-	};
+	}
 	usb_log_debug("RH(%p-%u): Reset complete", job->hub, job->port);
 	/* Handle port ownership, if the port is not enabled
Index: uspace/drv/bus/usb/ehci/hc.c
===================================================================
--- uspace/drv/bus/usb/ehci/hc.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/drv/bus/usb/ehci/hc.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -210,5 +210,5 @@
 	dma_buffer_free(&hc->dma_buffer);
 	return EOK;
-};
+}
 
 void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep)
Index: uspace/drv/bus/usb/uhci/uhci_rh.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -252,5 +252,5 @@
 	    hub->reset_changed[port] ? "-reset" : "");
 	memcpy(data, &status, sizeof(status));
-	*act_size = sizeof(status);;
+	*act_size = sizeof(status);
 	return EOK;
 }
Index: uspace/drv/nic/e1k/e1k.c
===================================================================
--- uspace/drv/nic/e1k/e1k.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/drv/nic/e1k/e1k.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -544,5 +544,5 @@
 	fibril_mutex_unlock(&e1000->rx_lock);
 	return rc;
-};
+}
 
 /** Write receive address to RA registr
@@ -2281,5 +2281,5 @@
 	fibril_mutex_unlock(&e1000->rx_lock);
 	return EOK;
-};
+}
 
 /** Set card MAC address
Index: uspace/drv/nic/rtl8169/driver.c
===================================================================
--- uspace/drv/nic/rtl8169/driver.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/drv/nic/rtl8169/driver.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -34,4 +34,5 @@
 #include <byteorder.h>
 #include <libarch/barrier.h>
+#include <stdbool.h>
 
 #include <as.h>
@@ -674,5 +675,5 @@
 	unsigned int i = first;
 
-	for (;;) {
+	while (true) {
 		descr = &rtl8169->rx_ring[i];
 		buff_phys = rtl8169->rx_buff_phys + (BUFFER_SIZE * i);
@@ -991,5 +992,5 @@
 	tail = rtl8169->rx_tail;
 
-	for (;;) {
+	while (true) {
 		descr = &rtl8169->rx_ring[tail];
 
Index: uspace/drv/platform/amdm37x/amdm37x.c
===================================================================
--- uspace/drv/platform/amdm37x/amdm37x.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/drv/platform/amdm37x/amdm37x.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -282,5 +282,5 @@
 			    "freq: %d, div: %d", base_freq, div);
 			return;
-		};
+		}
 		assert(div <= 127);
 
Index: uspace/lib/bithenge/src/compound.c
===================================================================
--- uspace/lib/bithenge/src/compound.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/bithenge/src/compound.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -70,5 +70,6 @@
 
 	/* i ranges from (self->num - 1) to 0 inside the loop. */
-	for (size_t i = self->num; i--; ) {
+	size_t i = self->num;
+	while (i-- != 0) {
 		bithenge_node_t *tmp;
 		rc = bithenge_transform_apply(self->xforms[i], scope, in,
Index: uspace/lib/bithenge/src/print.c
===================================================================
--- uspace/lib/bithenge/src/print.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/bithenge/src/print.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -162,5 +162,6 @@
 	const char *value = bithenge_string_node_value(node);
 	state_printf(state, "\"");
-	for (string_iterator_t i = string_iterator(value); !string_iterator_done(&i); ) {
+	string_iterator_t i = string_iterator(value);
+	while (!string_iterator_done(&i)) {
 		wchar_t ch;
 		errno_t rc = string_iterator_next(&i, &ch);
Index: uspace/lib/bithenge/src/sequence.c
===================================================================
--- uspace/lib/bithenge/src/sequence.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/bithenge/src/sequence.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -607,7 +607,6 @@
 	self->subtransforms = subtransforms;
 	self->num_subtransforms = 0;
-	for (self->num_subtransforms = 0;
-	    subtransforms[self->num_subtransforms].transform;
-	    self->num_subtransforms++);
+	while (subtransforms[self->num_subtransforms].transform)
+	    self->num_subtransforms++;
 	*out = struct_as_transform(self);
 	return EOK;
Index: uspace/lib/c/generic/device/hw_res_parsed.c
===================================================================
--- uspace/lib/c/generic/device/hw_res_parsed.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/c/generic/device/hw_res_parsed.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -167,5 +167,5 @@
 			size_t s_size;
 
-			s_address = RNGABS(out->mem_ranges.ranges[i]);;
+			s_address = RNGABS(out->mem_ranges.ranges[i]);
 			s_size = RNGSZ(out->mem_ranges.ranges[i]);
 
@@ -237,5 +237,5 @@
 
 	return EOK;
-};
+}
 
 /** Get hw_resources from the parent device.
@@ -279,5 +279,5 @@
 
 	return rc;
-};
+}
 
 /** @}
Index: uspace/lib/c/generic/io/printf_core.c
===================================================================
--- uspace/lib/c/generic/io/printf_core.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/c/generic/io/printf_core.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -1517,5 +1517,5 @@
 				counter += retval;
 				j = nxt;
-				goto next_char;
+				continue;
 			case 'c':
 				if (qualifier == PrintfQualifierLong)
@@ -1527,9 +1527,9 @@
 					counter = -counter;
 					goto out;
-				};
+				}
 
 				counter += retval;
 				j = nxt;
-				goto next_char;
+				continue;
 
 			/*
@@ -1552,5 +1552,5 @@
 				counter += retval;
 				j = nxt;
-				goto next_char;
+				continue;
 
 			/*
@@ -1589,5 +1589,5 @@
 			case '%':
 				j = i;
-				goto next_char;
+				continue;
 
 			/*
@@ -1599,5 +1599,5 @@
 				 * so we will print whole bad format sequence.
 				 */
-				goto next_char;
+				continue;
 			}
 
@@ -1655,6 +1655,4 @@
 			j = nxt;
 		}
-next_char:
-		;
 	}
 
Index: uspace/lib/ext4/src/balloc.c
===================================================================
--- uspace/lib/ext4/src/balloc.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/ext4/src/balloc.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -352,4 +352,5 @@
 	uint32_t free_blocks;
 	uint32_t goal;
+	uint32_t block_size;
 
 	/* Find GOAL */
@@ -585,8 +586,5 @@
 
 success:
-	/* Empty command - because of syntax */
-	;
-
-	uint32_t block_size = ext4_superblock_get_block_size(sb);
+	block_size = ext4_superblock_get_block_size(sb);
 
 	/* Update superblock free blocks count */
Index: uspace/lib/ext4/src/extent.c
===================================================================
--- uspace/lib/ext4/src/extent.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/ext4/src/extent.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -476,4 +476,5 @@
 	uint16_t pos = 0;
 	errno_t rc;
+	errno_t rc2;
 	while (ext4_extent_header_get_depth(eh) != 0) {
 		/* Search index in index node by iblock */
@@ -513,7 +514,5 @@
 
 cleanup:
-	;
-
-	errno_t rc2 = EOK;
+	rc2 = EOK;
 
 	/*
@@ -623,4 +622,5 @@
 	/* Find the first extent to modify */
 	ext4_extent_path_t *path;
+	errno_t rc2;
 	errno_t rc = ext4_extent_find_extent(inode_ref, iblock_from, &path);
 	if (rc != EOK)
@@ -734,7 +734,5 @@
 
 cleanup:
-	;
-
-	errno_t rc2 = EOK;
+	rc2 = EOK;
 
 	/*
@@ -982,4 +980,5 @@
 	/* Load the nearest leaf (with extent) */
 	ext4_extent_path_t *path;
+	errno_t rc2;
 	errno_t rc = ext4_extent_find_extent(inode_ref, new_block_idx, &path);
 	if (rc != EOK)
@@ -1086,7 +1085,5 @@
 
 finish:
-	;
-
-	errno_t rc2 = EOK;
+	rc2 = EOK;
 
 	/* Set return values */
Index: uspace/lib/ext4/src/ops.c
===================================================================
--- uspace/lib/ext4/src/ops.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/ext4/src/ops.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -219,4 +219,5 @@
 	ext4_node_t *eparent = EXT4_NODE(pfn);
 	ext4_filesystem_t *fs = eparent->instance->filesystem;
+	errno_t rc2;
 
 	if (!ext4_inode_is_type(fs->superblock, eparent->inode_ref->inode,
@@ -244,8 +245,6 @@
 
 exit:
-	;
-
 	/* Destroy search result structure */
-	errno_t const rc2 = ext4_directory_destroy_result(&result);
+	rc2 = ext4_directory_destroy_result(&result);
 	return rc == EOK ? rc2 : rc;
 }
@@ -1279,4 +1278,5 @@
 {
 	fs_node_t *fn;
+	errno_t rc2;
 	errno_t rc = ext4_node_get(&fn, service_id, index);
 	if (rc != EOK)
@@ -1395,7 +1395,5 @@
 
 exit:
-	;
-
-	errno_t const rc2 = ext4_node_put(fn);
+	rc2 = ext4_node_put(fn);
 	return rc == EOK ? rc2 : rc;
 }
Index: uspace/lib/hound/src/protocol.c
===================================================================
--- uspace/lib/hound/src/protocol.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/hound/src/protocol.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -73,5 +73,5 @@
 		uint8_t channels;
 		uint8_t format;
-	} f __attribute__((packed));
+	} __attribute__((packed)) f;
 	sysarg_t arg;
 } format_convert_t;
@@ -385,4 +385,10 @@
 void hound_connection_handler(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+	hound_context_id_t id;
+	errno_t ret;
+	int flags;
+	void *source;
+	void *sink;
+
 	/* Accept connection if there is a valid iface*/
 	if (server_iface) {
@@ -397,5 +403,5 @@
 		ipc_callid_t callid = async_get_call(&call);
 		switch (IPC_GET_IMETHOD(call)) {
-		case IPC_M_HOUND_CONTEXT_REGISTER: {
+		case IPC_M_HOUND_CONTEXT_REGISTER:
 			/* check interface functions */
 			if (!server_iface || !server_iface->add_context) {
@@ -407,11 +413,11 @@
 
 			/* Get context name */
-			errno_t ret =
-			    async_data_write_accept(&name, true, 0, 0, 0, 0);
+			ret = async_data_write_accept(&name, true, 0, 0, 0, 0);
 			if (ret != EOK) {
 				async_answer_0(callid, ret);
 				break;
 			}
-			hound_context_id_t id = 0;
+
+			id = 0;
 			ret = server_iface->add_context(server_iface->server,
 			    &id, name, record);
@@ -424,6 +430,5 @@
 			}
 			break;
-		}
-		case IPC_M_HOUND_CONTEXT_UNREGISTER: {
+		case IPC_M_HOUND_CONTEXT_UNREGISTER:
 			/* check interface functions */
 			if (!server_iface || !server_iface->rem_context) {
@@ -433,11 +438,10 @@
 
 			/* get id, 1st param */
-			hound_context_id_t id = IPC_GET_ARG1(call);
-			const errno_t ret =
-			    server_iface->rem_context(server_iface->server, id);
+			id = IPC_GET_ARG1(call);
+			ret = server_iface->rem_context(server_iface->server,
+			    id);
 			async_answer_0(callid, ret);
 			break;
-		}
-		case IPC_M_HOUND_GET_LIST: {
+		case IPC_M_HOUND_GET_LIST:
 			/* check interface functions */
 			if (!server_iface || !server_iface->get_list) {
@@ -447,9 +451,9 @@
 
 			char **list = NULL;
-			const int flags = IPC_GET_ARG1(call);
+			flags = IPC_GET_ARG1(call);
 			size_t count = IPC_GET_ARG2(call);
 			const bool conn = IPC_GET_ARG3(call);
 			char *conn_name = NULL;
-			errno_t ret = EOK;
+			ret = EOK;
 
 			/* get connected actor name if provided */
@@ -501,6 +505,5 @@
 			free(list);
 			break;
-		}
-		case IPC_M_HOUND_CONNECT: {
+		case IPC_M_HOUND_CONNECT:
 			/* check interface functions */
 			if (!server_iface || !server_iface->connect) {
@@ -509,10 +512,10 @@
 			}
 
-			void *source = NULL;
-			void *sink = NULL;
+			source = NULL;
+			sink = NULL;
 
 			/* read source name */
-			errno_t ret =
-			    async_data_write_accept(&source, true, 0, 0, 0, 0);
+			ret = async_data_write_accept(&source, true, 0, 0, 0,
+			    0);
 			/* read sink name */
 			if (ret == EOK)
@@ -527,6 +530,5 @@
 			async_answer_0(callid, ret);
 			break;
-		}
-		case IPC_M_HOUND_DISCONNECT: {
+		case IPC_M_HOUND_DISCONNECT:
 			/* check interface functions */
 			if (!server_iface || !server_iface->disconnect) {
@@ -535,10 +537,10 @@
 			}
 
-			void *source = NULL;
-			void *sink = NULL;
+			source = NULL;
+			sink = NULL;
 
 			/* read source name */
-			errno_t ret =
-			    async_data_write_accept(&source, true, 0, 0, 0, 0);
+			ret = async_data_write_accept(&source, true, 0, 0, 0,
+			    0);
 			/*read sink name */
 			if (ret == EOK)
@@ -552,6 +554,5 @@
 			async_answer_0(callid, ret);
 			break;
-		}
-		case IPC_M_HOUND_STREAM_ENTER: {
+		case IPC_M_HOUND_STREAM_ENTER:
 			/* check interface functions */
 			if (!server_iface || !server_iface->is_record_context
@@ -563,6 +564,6 @@
 
 			/* get parameters */
-			hound_context_id_t id = IPC_GET_ARG1(call);
-			const int flags = IPC_GET_ARG2(call);
+			id = IPC_GET_ARG1(call);
+			flags = IPC_GET_ARG2(call);
 			const format_convert_t c = {.arg = IPC_GET_ARG3(call)};
 			const pcm_format_t f = {
@@ -574,5 +575,5 @@
 
 			void *stream;
-			errno_t ret = server_iface->add_stream(server_iface->server,
+			ret = server_iface->add_stream(server_iface->server,
 			    id, flags, f, bsize, &stream);
 			if (ret != EOK) {
@@ -604,5 +605,4 @@
 			}
 			break;
-		}
 		case IPC_M_HOUND_STREAM_EXIT:
 		case IPC_M_HOUND_STREAM_DRAIN:
Index: uspace/lib/math/include/mathtypes.h
===================================================================
--- uspace/lib/math/include/mathtypes.h	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/math/include/mathtypes.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -96,5 +96,5 @@
 		uint32_t exp : 8;
 		uint32_t fraction : 23;
-	} parts __attribute__((packed));
+	} __attribute__((packed)) parts;
 } float32;
 
@@ -106,5 +106,5 @@
 		uint64_t exp : 11;
 		uint64_t fraction : 52;
-	} parts __attribute__((packed));
+	} __attribute__((packed)) parts;
 } float64;
 
@@ -113,5 +113,5 @@
 		uint64_t hi;
 		uint32_t lo;
-	} bin __attribute__((packed));
+	} __attribute__((packed)) bin;
 
 	struct {
@@ -120,5 +120,5 @@
 		uint64_t exp : 15;
 		uint64_t fraction : 64;
-	} parts __attribute__((packed));
+	} __attribute__((packed)) parts;
 } float96;
 
@@ -127,5 +127,5 @@
 		uint64_t hi;
 		uint64_t lo;
-	} bin __attribute__((packed));
+	} __attribute__((packed)) bin;
 
 	struct {
@@ -134,5 +134,5 @@
 		uint64_t frac_hi : 48;
 		uint64_t frac_lo : 64;
-	} parts __attribute__((packed));
+	} __attribute__((packed)) parts;
 } float128;
 
@@ -146,5 +146,5 @@
 		uint32_t exp : 8;
 		uint32_t sign : 1;
-	} parts __attribute__((packed));
+	} __attribute__((packed)) parts;
 } float32;
 
@@ -156,5 +156,5 @@
 		uint64_t exp : 11;
 		uint64_t sign : 1;
-	} parts __attribute__((packed));
+	} __attribute__((packed)) parts;
 } float64;
 
@@ -163,5 +163,5 @@
 		uint32_t lo;
 		uint64_t hi;
-	} bin __attribute__((packed));
+	} __attribute__((packed)) bin;
 
 	struct {
@@ -170,5 +170,5 @@
 		uint64_t sign : 1;
 		uint64_t padding : 16;
-	} parts __attribute__((packed));
+	} __attribute__((packed)) parts;
 } float96;
 
@@ -177,5 +177,5 @@
 		uint64_t lo;
 		uint64_t hi;
-	} bin __attribute__((packed));
+	} __attribute__((packed)) bin;
 
 	struct {
@@ -184,5 +184,5 @@
 		uint64_t exp : 15;
 		uint64_t sign : 1;
-	} parts __attribute__((packed));
+	} __attribute__((packed)) parts;
 } float128;
 
Index: uspace/lib/nic/src/nic_driver.c
===================================================================
--- uspace/lib/nic/src/nic_driver.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/nic/src/nic_driver.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -389,5 +389,5 @@
 		*period = nic_data->poll_period;
 	return nic_data->poll_mode;
-};
+}
 
 /** Inform the NICF about poll mode
@@ -487,5 +487,5 @@
 
 	memcpy(addr, &nic_data->mac, sizeof(nic_address_t));
-};
+}
 
 /**
Index: uspace/lib/pcm/src/format.c
===================================================================
--- uspace/lib/pcm/src/format.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ uspace/lib/pcm/src/format.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -304,5 +304,6 @@
 	case PCM_SAMPLE_SINT24_BE:
 	case PCM_SAMPLE_FLOAT32:
-	default: ;
+	default:
+		break;
 	}
 	return 0;
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 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -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 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -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 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -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 84239b1cd7c5ed286263ce4edb649da00b34b249)
@@ -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;
 
 	/**