Index: uspace/lib/c/arch/arm32/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/tls.h	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/arch/arm32/include/libarch/tls.h	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -63,7 +63,7 @@
 	tls += sizeof(tcb_t) + ARM_TP_OFFSET;
 	asm volatile (
-		"mov r9, %0"
-		:
-		: "r" (tls)
+	    "mov r9, %0"
+	    :
+	    : "r" (tls)
 	);
 }
@@ -79,6 +79,6 @@
 	void *ret;
 	asm volatile (
-		"mov %0, r9"
-		: "=r"(ret)
+	    "mov %0, r9"
+	    : "=r" (ret)
 	);
 	return (tcb_t *) (ret - ARM_TP_OFFSET - sizeof(tcb_t));
Index: uspace/lib/c/arch/ia32/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/tls.h	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/arch/ia32/include/libarch/tls.h	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -51,5 +51,5 @@
 }
 
-static inline tcb_t * __tcb_get(void)
+static inline tcb_t *__tcb_get(void)
 {
 	void *retval;
Index: uspace/lib/c/arch/ia64/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/elf_linux.h	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/arch/ia64/include/libarch/elf_linux.h	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -47,5 +47,6 @@
 {
 	/* TODO */
-	(void) istate; (void) elf_regs;
+	(void) istate;
+	(void) elf_regs;
 }
 
Index: uspace/lib/c/arch/sparc64/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/tls.h	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/arch/sparc64/include/libarch/tls.h	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -51,5 +51,5 @@
 }
 
-static inline tcb_t * __tcb_get(void)
+static inline tcb_t *__tcb_get(void)
 {
 	void *retval;
Index: uspace/lib/c/generic/async.c
===================================================================
--- uspace/lib/c/generic/async.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/generic/async.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -943,6 +943,6 @@
 	link_t *tmp = timeout_list.head.next;
 	while (tmp != &timeout_list.head) {
-		awaiter_t *cur
-		    = list_get_instance(tmp, awaiter_t, to_event.link);
+		awaiter_t *cur =
+		    list_get_instance(tmp, awaiter_t, to_event.link);
 
 		if (tv_gteq(&cur->to_event.expires, &wd->to_event.expires))
@@ -1255,6 +1255,6 @@
 		 */
 		futex_down(&async_futex);
-		if ((usecs) && (conn->wdata.to_event.occurred)
-		    && (list_empty(&conn->msg_queue))) {
+		if ((usecs) && (conn->wdata.to_event.occurred) &&
+		    (list_empty(&conn->msg_queue))) {
 			/* If we timed out -> exit */
 			futex_up(&async_futex);
Index: uspace/lib/c/generic/double_to_str.c
===================================================================
--- uspace/lib/c/generic/double_to_str.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/generic/double_to_str.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -56,5 +56,5 @@
 static bool is_normalized(fp_num_t num)
 {
-	assert(8*sizeof(num.significand) == significand_width);
+	assert(8 * sizeof(num.significand) == significand_width);
 
 	/* Normalized == most significant bit of the significand is set. */
@@ -147,5 +147,5 @@
 /** Returns the interval [low, high] of numbers that convert to binary val. */
 static void get_normalized_bounds(ieee_double_t val, fp_num_t *high,
-	fp_num_t *low, fp_num_t *val_dist)
+    fp_num_t *low, fp_num_t *val_dist)
 {
 	/*
@@ -181,5 +181,5 @@
 
 	val_dist->significand =
-		val_dist->significand << (val_dist->exponent - high->exponent);
+	    val_dist->significand << (val_dist->exponent - high->exponent);
 	val_dist->exponent = high->exponent;
 }
@@ -198,5 +198,5 @@
  */
 static void calc_scaled_bounds(ieee_double_t val, fp_num_t *scaled_upper_bound,
-	fp_num_t *bounds_delta, fp_num_t *val_dist, int *scale)
+    fp_num_t *bounds_delta, fp_num_t *val_dist, int *scale)
 {
 	fp_num_t upper_bound, lower_bound;
@@ -251,5 +251,5 @@
 /** Rounds the last digit of buf so that it is closest to the converted number.*/
 static void round_last_digit(uint64_t rest, uint64_t w_dist, uint64_t delta,
-	uint64_t digit_val_diff, char *buf, int len)
+    uint64_t digit_val_diff, char *buf, int len)
 {
 	/*
@@ -277,6 +277,6 @@
 	bool next_in_val_rng = cur_greater_w && (rest + digit_val_diff < delta);
 	/* Rounding down by one would bring buf closer to the processed number. */
-	bool next_closer = next_in_val_rng
-		&& (rest + digit_val_diff < w_dist || rest - w_dist < w_dist - rest);
+	bool next_closer = next_in_val_rng &&
+	    (rest + digit_val_diff < w_dist || rest - w_dist < w_dist - rest);
 
 	/* Of the shortest strings pick the one that is closest to the actual
@@ -291,6 +291,6 @@
 		cur_greater_w = rest < w_dist;
 		next_in_val_rng = cur_greater_w && (rest + digit_val_diff < delta);
-		next_closer = next_in_val_rng
-			&& (rest + digit_val_diff < w_dist || rest - w_dist < w_dist - rest);
+		next_closer = next_in_val_rng &&
+		    (rest + digit_val_diff < w_dist || rest - w_dist < w_dist - rest);
 	}
 }
@@ -326,5 +326,5 @@
  */
 static int gen_dec_digits(fp_num_t scaled_upper, fp_num_t delta,
-	fp_num_t val_dist, int scale, char *buf, size_t buf_size, int *dec_exponent)
+    fp_num_t val_dist, int scale, char *buf, size_t buf_size, int *dec_exponent)
 {
 	/*
@@ -411,5 +411,5 @@
 			/* Of the shortest representations choose the numerically closest. */
 			round_last_digit(remainder, val_dist.significand, delta.significand,
-				(uint64_t)div << (-one.exponent), buf, len);
+			    (uint64_t)div << (-one.exponent), buf, len);
 			return len;
 		}
@@ -457,5 +457,5 @@
 	/* Of the shortest representations choose the numerically closest one. */
 	round_last_digit(frac_part, val_dist.significand, delta.significand,
-		one.significand, buf, len);
+	    one.significand, buf, len);
 
 	return len;
@@ -504,5 +504,5 @@
  */
 int double_to_short_str(ieee_double_t ieee_val, char *buf, size_t buf_size,
-	int *dec_exponent)
+    int *dec_exponent)
 {
 	/* The whole computation assumes 64bit significand. */
@@ -524,8 +524,8 @@
 
 	calc_scaled_bounds(ieee_val, &scaled_upper_bound,
-		&delta, &val_dist, &scale);
+	    &delta, &val_dist, &scale);
 
 	int len = gen_dec_digits(scaled_upper_bound, delta, val_dist, scale,
-		buf, buf_size, dec_exponent);
+	    buf, buf_size, dec_exponent);
 
 	assert(len <= MAX_DOUBLE_STR_LEN);
@@ -554,5 +554,5 @@
  */
 static int gen_fixed_dec_digits(fp_num_t w_scaled, int scale, int signif_d_cnt,
-	int frac_d_cnt, char *buf, size_t buf_size, int *dec_exponent)
+    int frac_d_cnt, char *buf, size_t buf_size, int *dec_exponent)
 {
 	/* We'll produce at least one digit and a null terminator. */
@@ -608,5 +608,5 @@
 	int rem_signif_d_cnt = signif_d_cnt;
 	int rem_frac_d_cnt =
-		(frac_d_cnt >= 0) ? (kappa - scale + frac_d_cnt) : INT_MAX;
+	    (frac_d_cnt >= 0) ? (kappa - scale + frac_d_cnt) : INT_MAX;
 
 	/* Produce decimal digits for the integral part of w_scaled. */
@@ -752,5 +752,5 @@
  */
 int double_to_fixed_str(ieee_double_t ieee_val, int signif_d_cnt,
-	int frac_d_cnt, char *buf, size_t buf_size, int *dec_exponent)
+    int frac_d_cnt, char *buf, size_t buf_size, int *dec_exponent)
 {
 	/* The whole computation assumes 64bit significand. */
@@ -780,5 +780,5 @@
 	/* Produce decimal digits from the scaled number. */
 	int len = gen_fixed_dec_digits(w_scaled, scale, signif_d_cnt, frac_d_cnt,
-		buf, buf_size, dec_exponent);
+	    buf, buf_size, dec_exponent);
 
 	assert(len <= MAX_DOUBLE_STR_LEN);
Index: uspace/lib/c/generic/elf/elf_mod.c
===================================================================
--- uspace/lib/c/generic/elf/elf_mod.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/generic/elf/elf_mod.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -273,5 +273,5 @@
 		// FIXME: This actually won't work, because the text segment is
 		// not loaded yet.
-		#if 0
+#if 0
 		if (elf->info->interp[entry->p_filesz - 1] != '\0') {
 			DPRINTF("Unterminated ELF interp string.\n");
@@ -279,5 +279,5 @@
 		}
 		DPRINTF("interpreter: \"%s\"\n", elf->info->interp);
-		#endif
+#endif
 		break;
 	case PT_DYNAMIC:
@@ -286,5 +286,5 @@
 		    (void *)((uint8_t *)entry->p_vaddr + elf->bias);
 		DPRINTF("dynamic section found at %p\n",
-			(void *)elf->info->dynamic);
+		    (void *)elf->info->dynamic);
 		break;
 	case 0x70000000:
@@ -334,5 +334,5 @@
 
 	DPRINTF("Load segment at addr %p, size 0x%zx\n", (void *) seg_addr,
-		entry->p_memsz);
+	    entry->p_memsz);
 
 	if (entry->p_align > 1) {
@@ -394,5 +394,6 @@
 	 * need to set the right access mode and ensure SMC coherence.
 	 */
-	if ((elf->flags & ELDF_RW) != 0) return EE_OK;
+	if ((elf->flags & ELDF_RW) != 0)
+		return EE_OK;
 
 //	printf("set area flags to %d\n", flags);
Index: uspace/lib/c/generic/getopt.c
===================================================================
--- uspace/lib/c/generic/getopt.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/generic/getopt.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -132,5 +132,5 @@
 
 	for (i = 0; i < ncycle; i++) {
-		cstart = panonopt_end+i;
+		cstart = panonopt_end + i;
 		pos = cstart;
 		for (j = 0; j < cyclelen; j++) {
@@ -181,6 +181,5 @@
 				    optind, nargv);
 				optind -= nonopt_end - nonopt_start;
-			}
-			else if (nonopt_start != -1) {
+			} else if (nonopt_start != -1) {
 				/*
 				 * If we skipped non-options, set optind
@@ -192,6 +191,6 @@
 			return -1;
 		}
-		if ((*(place = nargv[optind]) != '-')
-		    || (place[1] == '\0')) {    /* found non-option */
+		if ((*(place = nargv[optind]) != '-') ||
+		    (place[1] == '\0')) {    /* found non-option */
 			place = EMSG;
 			if (IN_ORDER) {
@@ -289,5 +288,5 @@
  *	Parse argc/argv argument vector.
  */
-int getopt(int nargc, char * const *nargv, const char *options)
+int getopt(int nargc, char *const *nargv, const char *options)
 {
 	int retval;
@@ -305,5 +304,5 @@
 		if (nonopt_end != -1) {
 			permute_args(nonopt_start, nonopt_end, optind,
-				       (char **)nargv);
+			    (char **)nargv);
 			optind -= nonopt_end - nonopt_start;
 		}
@@ -318,5 +317,5 @@
  *	Parse argc/argv argument vector.
  */
-int getopt_long(int nargc, char * const *nargv, const char *options,
+int getopt_long(int nargc, char *const *nargv, const char *options,
     const struct option *long_options, int *idx)
 {
@@ -389,14 +388,14 @@
 			if (PRINT_ERROR)
 				printf(ambig, (int)current_argv_len,
-				     current_argv);
+				    current_argv);
 			optopt = 0;
 			return BADCH;
 		}
 		if (match != -1) {			/* option found */
-		        if (long_options[match].has_arg == no_argument
-			    && has_equal) {
+			if (long_options[match].has_arg == no_argument &&
+			    has_equal) {
 				if (PRINT_ERROR)
 					printf(noarg, (int)current_argv_len,
-					     current_argv);
+					    current_argv);
 				/*
 				 * XXX: GNU sets optopt to val regardless of
@@ -422,6 +421,6 @@
 				}
 			}
-			if ((long_options[match].has_arg == required_argument)
-			    && (optarg == NULL)) {
+			if ((long_options[match].has_arg == required_argument) &&
+			    (optarg == NULL)) {
 				/*
 				 * Missing argument; leading ':'
Index: uspace/lib/c/generic/io/io.c
===================================================================
--- uspace/lib/c/generic/io/io.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/generic/io/io.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -388,7 +388,7 @@
 	int rc = _fclose_nofree(stream);
 
-	if ((stream != &stdin_null)
-	    && (stream != &stdout_kio)
-	    && (stream != &stderr_kio))
+	if ((stream != &stdin_null) &&
+	    (stream != &stdout_kio) &&
+	    (stream != &stderr_kio))
 		free(stream);
 
Index: uspace/lib/c/generic/io/output.c
===================================================================
--- uspace/lib/c/generic/io/output.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/generic/io/output.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -89,6 +89,6 @@
 	ipc_call_t answer;
 	aid_t req = async_send_0(exch, OUTPUT_FRONTBUF_CREATE, &answer);
-	errno_t rc = async_share_out_start(exch, frontbuf, AS_AREA_READ
-	    | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+	errno_t rc = async_share_out_start(exch, frontbuf, AS_AREA_READ |
+	    AS_AREA_WRITE | AS_AREA_CACHEABLE);
 
 	async_exchange_end(exch);
Index: uspace/lib/c/generic/tls.c
===================================================================
--- uspace/lib/c/generic/tls.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/generic/tls.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -154,5 +154,5 @@
  * @return		Pointer to TCB structure.
  */
-tcb_t * tls_alloc_variant_2(void **data, size_t size)
+tcb_t *tls_alloc_variant_2(void **data, size_t size)
 {
 	tcb_t *tcb;
Index: uspace/lib/c/include/adt/hash.h
===================================================================
--- uspace/lib/c/include/adt/hash.h	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/include/adt/hash.h	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -106,6 +106,6 @@
 	 * http://burtleburtle.net/bob/c/lookup3.c
 	 */
-	seed ^= hash + 0x9e3779b9
-		+ ((seed << 5) | (seed >> (sizeof(size_t) * 8 - 5)));
+	seed ^= hash + 0x9e3779b9 +
+	    ((seed << 5) | (seed >> (sizeof(size_t) * 8 - 5)));
 	return seed;
 }
Index: uspace/lib/c/include/io/charfield.h
===================================================================
--- uspace/lib/c/include/io/charfield.h	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/include/io/charfield.h	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -91,10 +91,10 @@
 		return (a1.val.style == a2.val.style);
 	case CHAR_ATTR_INDEX:
-		return (a1.val.index.bgcolor == a2.val.index.bgcolor)
-		    && (a1.val.index.fgcolor == a2.val.index.fgcolor)
-		    && (a1.val.index.attr == a2.val.index.attr);
+		return (a1.val.index.bgcolor == a2.val.index.bgcolor) &&
+		    (a1.val.index.fgcolor == a2.val.index.fgcolor) &&
+		    (a1.val.index.attr == a2.val.index.attr);
 	case CHAR_ATTR_RGB:
-		return (a1.val.rgb.bgcolor == a2.val.rgb.bgcolor)
-		    && (a1.val.rgb.fgcolor == a2.val.rgb.fgcolor);
+		return (a1.val.rgb.bgcolor == a2.val.rgb.bgcolor) &&
+		    (a1.val.rgb.fgcolor == a2.val.rgb.fgcolor);
 	}
 
Index: uspace/lib/c/test/io/table.c
===================================================================
--- uspace/lib/c/test/io/table.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/test/io/table.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -34,5 +34,6 @@
 PCUT_TEST_SUITE(table);
 
-PCUT_TEST(smoke) {
+PCUT_TEST(smoke)
+{
 	table_t *table;
 	errno_t rc;
Index: uspace/lib/c/test/odict.c
===================================================================
--- uspace/lib/c/test/odict.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/test/odict.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -226,5 +226,6 @@
 	PCUT_ASSERT_EQUALS(true, odict_empty(&odict));
 
-	v = 1; ep = NULL;
+	v = 1;
+	ep = NULL;
 	for (i = 0; i < test_seq_len; i++) {
 		e = calloc(1, sizeof(test_entry_t));
Index: uspace/lib/c/test/sprintf.c
===================================================================
--- uspace/lib/c/test/sprintf.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/test/sprintf.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -48,5 +48,6 @@
 static char buffer[BUFFER_SIZE];
 
-PCUT_TEST_BEFORE {
+PCUT_TEST_BEFORE
+{
 	memset(buffer, 0, BUFFER_SIZE);
 }
Index: uspace/lib/c/test/str.c
===================================================================
--- uspace/lib/c/test/str.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
+++ uspace/lib/c/test/str.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -44,10 +44,12 @@
 static char buffer[BUFFER_SIZE];
 
-PCUT_TEST_BEFORE {
+PCUT_TEST_BEFORE
+{
 	memset(buffer, 0, BUFFER_SIZE);
 }
 
 
-PCUT_TEST(rtrim) {
+PCUT_TEST(rtrim)
+{
 	SET_BUFFER("foobar");
 	str_rtrim(buffer, ' ');
@@ -67,5 +69,6 @@
 }
 
-PCUT_TEST(ltrim) {
+PCUT_TEST(ltrim)
+{
 	SET_BUFFER("foobar");
 	str_ltrim(buffer, ' ');