Index: uspace/lib/libc/include/libc.h
===================================================================
--- uspace/lib/libc/include/libc.h	(revision 405e13aa248226e6f7612790ebd85070e3c4cd09)
+++ uspace/lib/libc/include/libc.h	(revision f15cb3c4c93269014a096d5c5a41bc60f0808fb9)
@@ -40,10 +40,16 @@
 #include <libarch/syscall.h>
 
-#define __SYSCALL0(id) __syscall0(0, 0, 0, 0, 0, 0, id)
-#define __SYSCALL1(id, p1) __syscall1(p1, 0, 0, 0, 0, 0, id)
-#define __SYSCALL2(id, p1, p2) __syscall2(p1, p2, 0, 0, 0, 0, id)
-#define __SYSCALL3(id, p1, p2, p3) __syscall3(p1, p2, p3, 0, 0, 0, id)
-#define __SYSCALL4(id, p1, p2, p3, p4) __syscall4(p1, p2, p3, p4, 0, 0, id)
-#define __SYSCALL5(id, p1, p2, p3, p4, p5) __syscall5(p1, p2, p3, p4, p5, 0, id)
+#define __SYSCALL0(id) \
+	__syscall0(0, 0, 0, 0, 0, 0, id)
+#define __SYSCALL1(id, p1) \
+	__syscall1(p1, 0, 0, 0, 0, 0, id)
+#define __SYSCALL2(id, p1, p2) \
+	__syscall2(p1, p2, 0, 0, 0, 0, id)
+#define __SYSCALL3(id, p1, p2, p3) \
+	__syscall3(p1, p2, p3, 0, 0, 0, id)
+#define __SYSCALL4(id, p1, p2, p3, p4) \
+	__syscall4(p1, p2, p3, p4, 0, 0, id)
+#define __SYSCALL5(id, p1, p2, p3, p4, p5) \
+	__syscall5(p1, p2, p3, p4, p5, 0, id)
 #define __SYSCALL6(id, p1, p2, p3, p4, p5, p6) \
     __syscall6(p1, p2, p3, p4, p5, p6, id)
Index: uspace/srv/console/gcons.c
===================================================================
--- uspace/srv/console/gcons.c	(revision 405e13aa248226e6f7612790ebd85070e3c4cd09)
+++ uspace/srv/console/gcons.c	(revision f15cb3c4c93269014a096d5c5a41bc60f0808fb9)
@@ -251,6 +251,6 @@
 void gcons_mouse_move(int dx, int dy)
 {
-	mouse_x = limit(mouse_x+dx, 0, xres);
-	mouse_y = limit(mouse_y+dy, 0, yres);
+	mouse_x = limit(mouse_x + dx, 0, xres);
+	mouse_y = limit(mouse_y + dy, 0, yres);
 
 	async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
@@ -259,5 +259,5 @@
 static int gcons_find_conbut(int x, int y)
 {
-	int status_start = STATUS_START + (xres - 800) / 2;;
+	int status_start = STATUS_START + (xres - 800) / 2;
 
 	if (y < STATUS_TOP || y >= STATUS_TOP + STATUS_HEIGHT)
@@ -269,8 +269,8 @@
 	if (x >= status_start + (STATUS_WIDTH + STATUS_SPACE) * CONSOLE_COUNT)
 		return -1;
-	if (((x - status_start) % (STATUS_WIDTH+STATUS_SPACE)) < STATUS_SPACE)
-		return -1;
-	
-	return (x - status_start) / (STATUS_WIDTH+STATUS_SPACE);
+	if (((x - status_start) % (STATUS_WIDTH + STATUS_SPACE)) < STATUS_SPACE)
+		return -1;
+	
+	return (x - status_start) / (STATUS_WIDTH + STATUS_SPACE);
 }