Index: kernel/arch/amd64/include/arch/asm.h
===================================================================
--- kernel/arch/amd64/include/arch/asm.h	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ kernel/arch/amd64/include/arch/asm.h	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -402,25 +402,25 @@
 	}
 
-GEN_READ_REG(cr0)
-GEN_WRITE_REG(cr0)
-GEN_READ_REG(cr2)
-GEN_READ_REG(cr3)
-GEN_WRITE_REG(cr3)
-GEN_READ_REG(cr4)
-GEN_WRITE_REG(cr4)
-
-GEN_READ_REG(dr0)
-GEN_READ_REG(dr1)
-GEN_READ_REG(dr2)
-GEN_READ_REG(dr3)
-GEN_READ_REG(dr6)
-GEN_READ_REG(dr7)
-
-GEN_WRITE_REG(dr0)
-GEN_WRITE_REG(dr1)
-GEN_WRITE_REG(dr2)
-GEN_WRITE_REG(dr3)
-GEN_WRITE_REG(dr6)
-GEN_WRITE_REG(dr7)
+GEN_READ_REG(cr0);
+GEN_WRITE_REG(cr0);
+GEN_READ_REG(cr2);
+GEN_READ_REG(cr3);
+GEN_WRITE_REG(cr3);
+GEN_READ_REG(cr4);
+GEN_WRITE_REG(cr4);
+
+GEN_READ_REG(dr0);
+GEN_READ_REG(dr1);
+GEN_READ_REG(dr2);
+GEN_READ_REG(dr3);
+GEN_READ_REG(dr6);
+GEN_READ_REG(dr7);
+
+GEN_WRITE_REG(dr0);
+GEN_WRITE_REG(dr1);
+GEN_WRITE_REG(dr2);
+GEN_WRITE_REG(dr3);
+GEN_WRITE_REG(dr6);
+GEN_WRITE_REG(dr7);
 
 extern void asm_delay_loop(uint32_t);
Index: kernel/arch/ia32/include/arch/asm.h
===================================================================
--- kernel/arch/ia32/include/arch/asm.h	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ kernel/arch/ia32/include/arch/asm.h	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -82,24 +82,24 @@
 	}
 
-GEN_READ_REG(cr0)
-GEN_READ_REG(cr2)
-GEN_READ_REG(cr3)
-GEN_WRITE_REG(cr3)
-
-GEN_WRITE_REG(cr0)
-
-GEN_READ_REG(dr0)
-GEN_READ_REG(dr1)
-GEN_READ_REG(dr2)
-GEN_READ_REG(dr3)
-GEN_READ_REG(dr6)
-GEN_READ_REG(dr7)
-
-GEN_WRITE_REG(dr0)
-GEN_WRITE_REG(dr1)
-GEN_WRITE_REG(dr2)
-GEN_WRITE_REG(dr3)
-GEN_WRITE_REG(dr6)
-GEN_WRITE_REG(dr7)
+GEN_READ_REG(cr0);
+GEN_READ_REG(cr2);
+GEN_READ_REG(cr3);
+GEN_WRITE_REG(cr3);
+
+GEN_WRITE_REG(cr0);
+
+GEN_READ_REG(dr0);
+GEN_READ_REG(dr1);
+GEN_READ_REG(dr2);
+GEN_READ_REG(dr3);
+GEN_READ_REG(dr6);
+GEN_READ_REG(dr7);
+
+GEN_WRITE_REG(dr0);
+GEN_WRITE_REG(dr1);
+GEN_WRITE_REG(dr2);
+GEN_WRITE_REG(dr3);
+GEN_WRITE_REG(dr6);
+GEN_WRITE_REG(dr7);
 
 #define IO_SPACE_BOUNDARY	((void *) (64 * 1024))
Index: uspace/app/bdsh/test/toktest.c
===================================================================
--- uspace/app/bdsh/test/toktest.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/app/bdsh/test/toktest.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -94,3 +94,3 @@
 
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/bithenge/src/transform.c
===================================================================
--- uspace/lib/bithenge/src/transform.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/bithenge/src/transform.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -879,4 +879,9 @@
 	*out = 8;
 	return EOK;
+}
+
+static uint8_t uint8_t_identity(uint8_t arg)
+{
+	return arg;
 }
 
@@ -914,5 +919,5 @@
 	}
 
-MAKE_UINT_TRANSFORM(uint8   , uint8_t ,                 , prefix_length_1);
+MAKE_UINT_TRANSFORM(uint8   , uint8_t,  uint8_t_identity, prefix_length_1);
 MAKE_UINT_TRANSFORM(uint16le, uint16_t, uint16_t_le2host, prefix_length_2);
 MAKE_UINT_TRANSFORM(uint16be, uint16_t, uint16_t_be2host, prefix_length_2);
Index: uspace/lib/c/test/main.c
===================================================================
--- uspace/lib/c/test/main.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/c/test/main.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -40,3 +40,3 @@
 PCUT_IMPORT(table);
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/label/test/main.c
===================================================================
--- uspace/lib/label/test/main.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/label/test/main.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -33,3 +33,3 @@
 PCUT_IMPORT(label);
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/abort.c
===================================================================
--- uspace/lib/pcut/tests/abort.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/abort.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -36,3 +36,3 @@
 }
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/asserts.c
===================================================================
--- uspace/lib/pcut/tests/asserts.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/asserts.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -73,3 +73,3 @@
 }
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/beforeafter.c
===================================================================
--- uspace/lib/pcut/tests/beforeafter.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/beforeafter.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -71,3 +71,3 @@
 
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/errno.c
===================================================================
--- uspace/lib/pcut/tests/errno.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/errno.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -55,3 +55,3 @@
 }
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/manytests.c
===================================================================
--- uspace/lib/pcut/tests/manytests.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/manytests.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -118,3 +118,3 @@
 
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/printing.c
===================================================================
--- uspace/lib/pcut/tests/printing.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/printing.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -46,3 +46,3 @@
 }
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/simple.c
===================================================================
--- uspace/lib/pcut/tests/simple.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/simple.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -47,3 +47,3 @@
 }
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/skip.c
===================================================================
--- uspace/lib/pcut/tests/skip.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/skip.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -44,3 +44,3 @@
 }
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/suite_all.c
===================================================================
--- uspace/lib/pcut/tests/suite_all.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/suite_all.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -34,3 +34,3 @@
 PCUT_IMPORT(intmin_suite);
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/suites.c
===================================================================
--- uspace/lib/pcut/tests/suites.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/suites.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -52,3 +52,3 @@
 }
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/teardown.c
===================================================================
--- uspace/lib/pcut/tests/teardown.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/teardown.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -70,3 +70,3 @@
 
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/pcut/tests/teardownaborts.c
===================================================================
--- uspace/lib/pcut/tests/teardownaborts.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/pcut/tests/teardownaborts.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -42,3 +42,3 @@
 }
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/posix/Makefile
===================================================================
--- uspace/lib/posix/Makefile	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/posix/Makefile	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -188,3 +188,3 @@
 
 $(REDEFS_HIDE_LIBC): $(SOURCES)
-	sed -n -e 's/_HIDE_LIBC_SYMBOL(\(.*\))/\1 __helenos_libc_\1/p' $(SOURCES) >$@
+	sed -n -e 's/_HIDE_LIBC_SYMBOL(\(.*\));/\1 __helenos_libc_\1/p' $(SOURCES) >$@
Index: uspace/lib/posix/src/dlfcn.c
===================================================================
--- uspace/lib/posix/src/dlfcn.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/posix/src/dlfcn.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -34,5 +34,5 @@
 #include "posix/dlfcn.h"
 
-_HIDE_LIBC_SYMBOL(dlopen)
+_HIDE_LIBC_SYMBOL(dlopen);
 extern void *__helenos_libc_dlopen(const char *filename, int flags);
 
Index: uspace/lib/posix/src/stdio/scanf.c
===================================================================
--- uspace/lib/posix/src/stdio/scanf.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/posix/src/stdio/scanf.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -676,40 +676,50 @@
 				if (!assign_supress) {
 					if (int_conv_unsigned) {
+						unsigned char *phh;
+						unsigned short *ph;
+						unsigned *pdef;
+						unsigned long *pl;
+						unsigned long long *pll;
+						uintmax_t *pj;
+						size_t *pz;
+						// XXX: What is unsigned counterpart of the ptrdiff_t?
+						size_t *pt;
+						void **pp;
+
 						switch (length_mod) {
-						case LMOD_hh: ; /* Label cannot be part of declaration. */
-							unsigned char *phh = va_arg(arg, unsigned char *);
+						case LMOD_hh:
+							phh = va_arg(arg, unsigned char *);
 							*phh = (unsigned char) ures;
 							break;
-						case LMOD_h: ;
-							unsigned short *ph = va_arg(arg, unsigned short *);
+						case LMOD_h:
+							ph = va_arg(arg, unsigned short *);
 							*ph = (unsigned short) ures;
 							break;
-						case LMOD_NONE: ;
-							unsigned *pdef = va_arg(arg, unsigned *);
+						case LMOD_NONE:
+							pdef = va_arg(arg, unsigned *);
 							*pdef = (unsigned) ures;
 							break;
-						case LMOD_l: ;
-							unsigned long *pl = va_arg(arg, unsigned long *);
+						case LMOD_l:
+							pl = va_arg(arg, unsigned long *);
 							*pl = (unsigned long) ures;
 							break;
-						case LMOD_ll: ;
-							unsigned long long *pll = va_arg(arg, unsigned long long *);
+						case LMOD_ll:
+							pll = va_arg(arg, unsigned long long *);
 							*pll = (unsigned long long) ures;
 							break;
-						case LMOD_j: ;
-							uintmax_t *pj = va_arg(arg, uintmax_t *);
+						case LMOD_j:
+							pj = va_arg(arg, uintmax_t *);
 							*pj = (uintmax_t) ures;
 							break;
-						case LMOD_z: ;
-							size_t *pz = va_arg(arg, size_t *);
+						case LMOD_z:
+							pz = va_arg(arg, size_t *);
 							*pz = (size_t) ures;
 							break;
-						case LMOD_t: ;
-							// XXX: What is unsigned counterpart of the ptrdiff_t?
-							size_t *pt = va_arg(arg, size_t *);
+						case LMOD_t:
+							pt = va_arg(arg, size_t *);
 							*pt = (size_t) ures;
 							break;
-						case LMOD_p: ;
-							void **pp = va_arg(arg, void **);
+						case LMOD_p:
+							pp = va_arg(arg, void **);
 							*pp = (void *) (uintptr_t) ures;
 							break;
@@ -718,35 +728,44 @@
 						}
 					} else {
+						signed char *phh;
+						short *ph;
+						int *pdef;
+						long *pl;
+						long long *pll;
+						intmax_t *pj;
+						ssize_t *pz;
+						ptrdiff_t *pt;
+
 						switch (length_mod) {
-						case LMOD_hh: ; /* Label cannot be part of declaration. */
-							signed char *phh = va_arg(arg, signed char *);
+						case LMOD_hh:
+							phh = va_arg(arg, signed char *);
 							*phh = (signed char) sres;
 							break;
-						case LMOD_h: ;
-							short *ph = va_arg(arg, short *);
+						case LMOD_h:
+							ph = va_arg(arg, short *);
 							*ph = (short) sres;
 							break;
-						case LMOD_NONE: ;
-							int *pdef = va_arg(arg, int *);
+						case LMOD_NONE:
+							pdef = va_arg(arg, int *);
 							*pdef = (int) sres;
 							break;
-						case LMOD_l: ;
-							long *pl = va_arg(arg, long *);
+						case LMOD_l:
+							pl = va_arg(arg, long *);
 							*pl = (long) sres;
 							break;
-						case LMOD_ll: ;
-							long long *pll = va_arg(arg, long long *);
+						case LMOD_ll:
+							pll = va_arg(arg, long long *);
 							*pll = (long long) sres;
 							break;
-						case LMOD_j: ;
-							intmax_t *pj = va_arg(arg, intmax_t *);
+						case LMOD_j:
+							pj = va_arg(arg, intmax_t *);
 							*pj = (intmax_t) sres;
 							break;
-						case LMOD_z: ;
-							ssize_t *pz = va_arg(arg, ssize_t *);
+						case LMOD_z:
+							pz = va_arg(arg, ssize_t *);
 							*pz = (ssize_t) sres;
 							break;
-						case LMOD_t: ;
-							ptrdiff_t *pt = va_arg(arg, ptrdiff_t *);
+						case LMOD_t:
+							pt = va_arg(arg, ptrdiff_t *);
 							*pt = (ptrdiff_t) sres;
 							break;
@@ -857,15 +876,18 @@
 				 * into the next output argument. */
 				if (!assign_supress) {
+					float *pf;
+					double *pd;
+					long double *pld;
 					switch (length_mod) {
-					case LMOD_NONE: ; /* Label cannot be part of declaration. */
-						float *pf = va_arg(arg, float *);
+					case LMOD_NONE:
+						pf = va_arg(arg, float *);
 						*pf = fres;
 						break;
-					case LMOD_l: ;
-						double *pd = va_arg(arg, double *);
+					case LMOD_l:
+						pd = va_arg(arg, double *);
 						*pd = dres;
 						break;
-					case LMOD_L: ;
-						long double *pld = va_arg(arg, long double *);
+					case LMOD_L:
+						pld = va_arg(arg, long double *);
 						*pld = ldres;
 						break;
Index: uspace/lib/posix/src/string.c
===================================================================
--- uspace/lib/posix/src/string.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/posix/src/string.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -449,17 +449,15 @@
 	size_t prefix_table[nlen + 1];
 
-	{
-		size_t i = 0;
-		ssize_t j = -1;
-
+	size_t i = 0;
+	ssize_t j = -1;
+
+	prefix_table[i] = j;
+
+	while (i < nlen) {
+		while (j >= 0 && needle[i] != needle[j]) {
+			j = prefix_table[j];
+		}
+		i++; j++;
 		prefix_table[i] = j;
-
-		while (i < nlen) {
-			while (j >= 0 && needle[i] != needle[j]) {
-				j = prefix_table[j];
-			}
-			i++; j++;
-			prefix_table[i] = j;
-		}
 	}
 
Index: uspace/lib/posix/src/time.c
===================================================================
--- uspace/lib/posix/src/time.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/posix/src/time.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -235,10 +235,10 @@
 int clock_gettime(clockid_t clock_id, struct timespec *tp)
 {
+	struct timeval tv;
+
 	assert(tp != NULL);
 
 	switch (clock_id) {
 		case CLOCK_REALTIME:
-			;
-			struct timeval tv;
 			gettimeofday(&tv, NULL);
 			tp->tv_sec = tv.tv_sec;
Index: uspace/lib/posix/test/main.c
===================================================================
--- uspace/lib/posix/test/main.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/posix/test/main.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -33,3 +33,3 @@
 PCUT_IMPORT(scanf);
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/uri/test/main.c
===================================================================
--- uspace/lib/uri/test/main.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/uri/test/main.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -35,3 +35,3 @@
 
 
-PCUT_MAIN()
+PCUT_MAIN();
Index: uspace/lib/usbhost/src/utility.c
===================================================================
--- uspace/lib/usbhost/src/utility.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/lib/usbhost/src/utility.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -159,6 +159,6 @@
 		    | (USB_REQUEST_TYPE_CLASS << 5)
 		    | USB_REQUEST_RECIPIENT_DEVICE,
-		.request = USB_DEVREQ_GET_DESCRIPTOR, \
-		.value = uint16_host2usb(type << 8), \
+		.request = USB_DEVREQ_GET_DESCRIPTOR,
+		.value = uint16_host2usb(type << 8),
 		.length = sizeof(*desc),
 	};
Index: uspace/srv/net/tcp/test/main.c
===================================================================
--- uspace/srv/net/tcp/test/main.c	(revision 973be38782462a672111ff6833f8dbb40d2a44bf)
+++ uspace/srv/net/tcp/test/main.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
@@ -66,3 +66,3 @@
 PCUT_IMPORT(ucall);
 
-PCUT_MAIN()
+PCUT_MAIN();