Index: uspace/app/trace/trace.c
===================================================================
--- uspace/app/trace/trace.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/app/trace/trace.c	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -723,6 +723,8 @@
 	o = oper_new("vfs_mount", 2, arg_def, V_ERRNO, 0, resp_def);
 	proto_add_oper(p, VFS_IN_MOUNT, o);
-/*	o = oper_new("unmount", 0, arg_def);
-	proto_add_oper(p, VFS_IN_UNMOUNT, o);*/
+#if 0
+	o = oper_new("unmount", 0, arg_def);
+	proto_add_oper(p, VFS_IN_UNMOUNT, o);
+#endif
 	o = oper_new("vfs_sync", 1, arg_def, V_ERRNO, 0, resp_def);
 	proto_add_oper(p, VFS_IN_SYNC, o);
Index: uspace/app/websrv/websrv.c
===================================================================
--- uspace/app/websrv/websrv.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/app/websrv/websrv.c	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -375,6 +375,6 @@
 		verbose = true;
 		break;
-	/* Long options with double dash */
 	case '-':
+		/* Long options with double dash */
 		if (str_lcmp(argv[*index] + 2, "help", 5) == 0) {
 			usage();
Index: uspace/drv/hid/atkbd/atkbd.c
===================================================================
--- uspace/drv/hid/atkbd/atkbd.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/hid/atkbd/atkbd.c	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -309,9 +309,9 @@
 		async_answer_0(icall_handle, ENOTSUP);
 		break;
-	/*
-	 * This might be ugly but async_callback_receive_start makes no
-	 * difference for incorrect call and malloc failure.
-	 */
 	case IPC_M_CONNECT_TO_ME:
+		/*
+		 * This might be ugly but async_callback_receive_start makes no
+		 * difference for incorrect call and malloc failure.
+		 */
 		sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
 
Index: uspace/drv/hid/ps2mouse/ps2mouse.c
===================================================================
--- uspace/drv/hid/ps2mouse/ps2mouse.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/hid/ps2mouse/ps2mouse.c	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -324,5 +324,6 @@
 
 		/* Buttons */
-		/* NOTE: Parsing 4th and 5th button works even if this extension
+		/*
+		 * NOTE: Parsing 4th and 5th button works even if this extension
 		 * is not supported and whole 4th byte should be interpreted
 		 * as Z-axis movement. the upper 4 bits are just a sign
@@ -330,5 +331,6 @@
 		 * (i.e no change since that is the default) and - sign fails
 		 * the "imb" condition. Thus 4th and 5th buttons are never
-		 * down on wheel only extension. */
+		 * down on wheel only extension.
+		 */
 		const bool imb = (packet[3] & INTELLIMOUSE_ALWAYS_ZERO) == 0;
 		const bool status[] = {
@@ -411,7 +413,9 @@
 
 	switch (method) {
-	/* This might be ugly but async_callback_receive_start makes no
-	 * difference for incorrect call and malloc failure. */
 	case IPC_M_CONNECT_TO_ME:
+		/*
+		 * This might be ugly but async_callback_receive_start makes no
+		 * difference for incorrect call and malloc failure.
+		 */
 		sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
 		/* Probably ENOMEM error, try again. */
Index: uspace/drv/hid/xtkbd/xtkbd.c
===================================================================
--- uspace/drv/hid/xtkbd/xtkbd.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/drv/hid/xtkbd/xtkbd.c	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -364,9 +364,9 @@
 		async_answer_0(icall_handle, rc);
 		break;
-	/*
-	 * This might be ugly but async_callback_receive_start makes no
-	 * difference for incorrect call and malloc failure.
-	 */
 	case IPC_M_CONNECT_TO_ME:
+		/*
+		 * This might be ugly but async_callback_receive_start makes no
+		 * difference for incorrect call and malloc failure.
+		 */
 		sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
 
Index: uspace/lib/c/arch/mips32/src/syscall.c
===================================================================
--- uspace/lib/c/arch/mips32/src/syscall.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/lib/c/arch/mips32/src/syscall.c	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -31,5 +31,5 @@
  */
 /** @file
-  * @ingroup libcmips32
+ * @ingroup libcmips32
  */
 
@@ -57,8 +57,8 @@
 	      "r" (__mips_reg_t1),
 	      "r" (__mips_reg_v0)
-		/*
-		 * We are a function call, although C
-		 * does not know it.
-		 */
+	      /*
+	       * We are a function call, although C
+	       * does not know it.
+	       */
 	    : "%ra"
 	);
Index: uspace/lib/c/generic/io/printf_core.c
===================================================================
--- uspace/lib/c/generic/io/printf_core.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/lib/c/generic/io/printf_core.c	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -1499,7 +1499,7 @@
 
 			switch (uc) {
-			/*
-			 * String and character conversions.
-			 */
+				/*
+				 * String and character conversions.
+				 */
 			case 's':
 				precision = max(0,  precision);
@@ -1533,7 +1533,7 @@
 				continue;
 
-			/*
-			 * Floating point values
-			 */
+				/*
+				 * Floating point values
+				 */
 			case 'G':
 			case 'g':
@@ -1554,7 +1554,7 @@
 				continue;
 
-			/*
-			 * Integer values
-			 */
+				/*
+				 * Integer values
+				 */
 			case 'P':
 				/* Pointer */
@@ -1586,12 +1586,12 @@
 				break;
 
-			/* Percentile itself */
 			case '%':
+				/* Percentile itself */
 				j = i;
 				continue;
 
-			/*
-			 * Bad formatting.
-			 */
+				/*
+				 * Bad formatting.
+				 */
 			default:
 				/*
Index: uspace/lib/posix/src/internal/common.h
===================================================================
--- uspace/lib/posix/src/internal/common.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/lib/posix/src/internal/common.h	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -53,5 +53,6 @@
 #define _HIDE_LIBC_SYMBOL(symbol)
 
-/* Checks if the value is a failing error code.
+/** Checks if the value is a failing error code.
+ *
  * If so, writes the error code to errno and returns true.
  */
Index: uspace/lib/usb/src/port.c
===================================================================
--- uspace/lib/usb/src/port.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/lib/usb/src/port.c	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -224,6 +224,6 @@
 		break;
 
-	/* We first have to stop the fibril in progress. */
 	case PORT_CONNECTING:
+		/* We first have to stop the fibril in progress. */
 		port->state = PORT_ERROR;
 		fibril_condvar_broadcast(&port->enabled_cv);
Index: uspace/lib/usbhid/include/usb/hid/usages/kbdgen.h
===================================================================
--- uspace/lib/usbhid/include/usb/hid/usages/kbdgen.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/lib/usbhid/include/usb/hid/usages/kbdgen.h	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -32,5 +32,5 @@
 /** @file
  * @brief USB HID key codes.
- * @details
+ *
  * This is not a typical header as by default it is equal to empty file.
  * However, by cleverly defining the USB_HIDUT_KBD_KEY you can use it
@@ -39,10 +39,11 @@
  * For example, this creates enum for known keys:
  * @code
-#define USB_HIDUT_KBD_KEY(name, usage_id, l, lc, l1, l2) \
-	USB_KBD_KEY_##name = usage_id,
-typedef enum {
-	#include <usb/hidutkbd.h>
-} usb_key_code_t;
- @endcode
+ * #define USB_HIDUT_KBD_KEY(name, usage_id, l, lc, l1, l2) \
+ *     USB_KBD_KEY_##name = usage_id,
+ *
+ * typedef enum {
+ *         #include <usb/hidutkbd.h>
+ * } usb_key_code_t;
+ * @endcode
  *
  * Maybe, it might be better that you would place such enums into separate
Index: uspace/lib/usbhid/src/hidpath.c
===================================================================
--- uspace/lib/usbhid/src/hidpath.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/lib/usbhid/src/hidpath.c	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -213,6 +213,8 @@
 
 	switch (flags) {
-	/* Path is somewhere in report_path */
 	case USB_HID_PATH_COMPARE_ANYWHERE:
+		/*
+		 * Path is somewhere in report_path
+		 */
 		if (path->depth != 1) {
 			return 1;
@@ -239,8 +241,9 @@
 
 		return 1;
-		break;
-
-	/* The paths must be identical */
+
 	case USB_HID_PATH_COMPARE_STRICT:
+		/*
+		 * The paths must be identical
+		 */
 		if (report_path->depth != path->depth) {
 			return 1;
@@ -248,6 +251,8 @@
 		/* Fallthrough */
 
-	/* Path is prefix of the report_path */
 	case USB_HID_PATH_COMPARE_BEGIN:
+		/*
+		 * Path is prefix of the report_path
+		 */
 		report_link = report_path->items.head.next;
 		path_link = path->items.head.next;
@@ -283,6 +288,8 @@
 		break;
 
-	/* Path is suffix of report_path */
 	case USB_HID_PATH_COMPARE_END:
+		/*
+		 * Path is suffix of report_path
+		 */
 		report_link = report_path->items.head.prev;
 		path_link = path->items.head.prev;
Index: uspace/srv/fs/udf/udf_volume.c
===================================================================
--- uspace/srv/fs/udf/udf_volume.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/srv/fs/udf/udf_volume.c	(revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc)
@@ -655,5 +655,8 @@
 
 		switch (FLE16(vol->common.tag.id)) {
-		/* One sector size descriptors */
+			/*
+			 * One sector size descriptors
+			 */
+
 		case UDF_TAG_PVD:
 			log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume: Primary volume descriptor found");
@@ -728,5 +731,8 @@
 			break;
 
-		/* Relative size descriptors */
+			/*
+			 * Relative size descriptors
+			 */
+
 		case UDF_TAG_LVD:
 			log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume: Logical volume descriptor found");