Index: uspace/srv/audio/hound/audio_device.c
===================================================================
--- uspace/srv/audio/hound/audio_device.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/audio/hound/audio_device.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -170,6 +170,8 @@
 		    device_event_callback, dev);
 
-		/* Fill the buffer first. Fill the first two fragments,
-		 * so that we stay one fragment ahead */
+		/*
+		 * Fill the buffer first. Fill the first two fragments,
+		 * so that we stay one fragment ahead
+		 */
 		pcm_format_silence(dev->buffer.base, dev->buffer.size,
 		    &dev->sink.format);
Index: uspace/srv/bd/vbd/disk.c
===================================================================
--- uspace/srv/bd/vbd/disk.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/bd/vbd/disk.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -403,5 +403,6 @@
 
 /** Remove all disk partitions from our inventory leaving only the underlying
- * liblabel partition structures. */
+ * liblabel partition structures.
+ */
 static errno_t vbds_disk_parts_add(vbds_disk_t *disk, label_t *label)
 {
@@ -425,5 +426,6 @@
 
 /** Remove all disk partitions from our inventory leaving only the underlying
- * liblabel partition structures. */
+ * liblabel partition structures.
+ */
 static errno_t vbds_disk_parts_remove(vbds_disk_t *disk, vbds_rem_flag_t flag)
 {
Index: uspace/srv/devman/client_conn.c
===================================================================
--- uspace/srv/devman/client_conn.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/devman/client_conn.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -60,5 +60,6 @@
 
 /** Find handle for the device instance identified by the device's path in the
- * device tree. */
+ * device tree.
+ */
 static void devman_function_get_handle(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
Index: uspace/srv/fs/cdfs/cdfs_ops.c
===================================================================
--- uspace/srv/fs/cdfs/cdfs_ops.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/fs/cdfs/cdfs_ops.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -850,5 +850,6 @@
 
 /** Verify that escape sequence corresonds to one of the allowed encoding
- * escape sequences allowed for Joliet. */
+ * escape sequences allowed for Joliet.
+ */
 static errno_t cdfs_verify_joliet_esc_seq(uint8_t *seq)
 {
@@ -1049,5 +1050,6 @@
 }
 
-/* Mount a session with session start offset
+/*
+ * Mount a session with session start offset
  *
  */
Index: uspace/srv/fs/mfs/mfs.h
===================================================================
--- uspace/srv/fs/mfs/mfs.h	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/fs/mfs/mfs.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -106,9 +106,11 @@
 	unsigned zsearch;
 
-	/* Indicates wether if the cached number of free zones
+	/*
+	 * Indicates wether if the cached number of free zones
 	 * is to be considered valid or not.
 	 */
 	bool nfree_zones_valid;
-	/* Cached number of free zones, used to avoid to scan
+	/*
+	 * Cached number of free zones, used to avoid to scan
 	 * the whole bitmap every time the mfs_free_block_count()
 	 * is invoked.
Index: uspace/srv/fs/mfs/mfs_balloc.c
===================================================================
--- uspace/srv/fs/mfs/mfs_balloc.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/fs/mfs/mfs_balloc.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -191,5 +191,6 @@
 		bitchunk_t *data = (bitchunk_t *) b->data;
 
-		/* Read the bitmap block, chunk per chunk,
+		/*
+		 * Read the bitmap block, chunk per chunk,
 		 * counting the zero bits.
 		 */
Index: uspace/srv/fs/mfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/mfs/mfs_ops.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/fs/mfs/mfs_ops.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -246,5 +246,6 @@
 
 	if (sbi->log2_zone_size != 0) {
-		/* In MFS, file space is allocated per zones.
+		/*
+		 * In MFS, file space is allocated per zones.
 		 * Zones are a collection of consecutive blocks on disk.
 		 *
@@ -776,5 +777,6 @@
 
 	if (chino->i_nlinks <= 1 && S_ISDIR(chino->i_mode)) {
-		/* The child directory will be destroyed, decrease the
+		/*
+		 * The child directory will be destroyed, decrease the
 		 * parent hard links counter.
 		 */
@@ -1239,5 +1241,6 @@
 
 	if (!sbi->nfree_zones_valid) {
-		/* The cached number of free zones is not valid,
+		/*
+		 * The cached number of free zones is not valid,
 		 * we need to scan the bitmap to retrieve the
 		 * current value.
Index: uspace/srv/hid/compositor/compositor.c
===================================================================
--- uspace/srv/hid/compositor/compositor.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/hid/compositor/compositor.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -77,6 +77,8 @@
 #define NAMESPACE  "comp"
 
-/* Until there is blitter support and some further optimizations, window
- * animations are too slow to be practically usable. */
+/*
+ * Until there is blitter support and some further optimizations, window
+ * animations are too slow to be practically usable.
+ */
 #ifndef ANIMATE_WINDOW_TRANSFORMS
 #define ANIMATE_WINDOW_TRANSFORMS 0
@@ -422,6 +424,8 @@
 			    link != &window_list.head; link = link->prev) {
 
-				/* Determine what part of the window intersects with the
-				 * updated area of the current viewport. */
+				/*
+				 * Determine what part of the window intersects with the
+				 * updated area of the current viewport.
+				 */
 				window_t *win = list_get_instance(link, window_t, link);
 				if (!win->surface) {
@@ -438,6 +442,8 @@
 
 				if (isec_win) {
-					/* Prepare conversion from global coordinates to viewport
-					 * coordinates. */
+					/*
+					 * Prepare conversion from global coordinates to viewport
+					 * coordinates.
+					 */
 					transform = win->transform;
 					double_point_t pos;
@@ -470,5 +476,6 @@
 
 					if (isec_ghost) {
-						/* FIXME: Ghost is currently drawn based on the bounding
+						/*
+						 * FIXME: Ghost is currently drawn based on the bounding
 						 * rectangle of the window, which is sufficient as long
 						 * as the windows can be rotated only by 90 degrees.
@@ -476,5 +483,6 @@
 						 * rotation, it should be drawn as four lines adjusted
 						 * by the transformation matrix. That would however
-						 * require to equip libdraw with line drawing functionality. */
+						 * require to equip libdraw with line drawing functionality.
+						 */
 
 						transform_t transform = ptr->ghost.transform;
@@ -532,6 +540,8 @@
 			list_foreach(pointer_list, link, pointer_t, ptr) {
 
-				/* Determine what part of the pointer intersects with the
-				 * updated area of the current viewport. */
+				/*
+				 * Determine what part of the pointer intersects with the
+				 * updated area of the current viewport.
+				 */
 				sysarg_t x_dmg_ptr, y_dmg_ptr, w_dmg_ptr, h_dmg_ptr;
 				surface_t *sf_ptr = ptr->cursor.states[ptr->state];
@@ -543,9 +553,11 @@
 
 				if (isec_ptr) {
-					/* Pointer is currently painted directly by copying pixels.
+					/*
+					 * Pointer is currently painted directly by copying pixels.
 					 * However, it is possible to draw the pointer similarly
 					 * as window by using drawctx_transfer. It would allow
 					 * more sophisticated control over drawing, but would also
-					 * cost more regarding the performance. */
+					 * cost more regarding the performance.
+					 */
 
 					sysarg_t x_vp = x_dmg_ptr - vp->pos.x;
@@ -857,6 +869,8 @@
 	loc_service_unregister(win->out_dsid);
 
-	/* In case the client was killed, input fibril of the window might be
-	 * still blocked on the condition within comp_window_get_event. */
+	/*
+	 * In case the client was killed, input fibril of the window might be
+	 * still blocked on the condition within comp_window_get_event.
+	 */
 	window_event_t *event_dummy = (window_event_t *) malloc(sizeof(window_event_t));
 	if (event_dummy) {
Index: uspace/srv/hid/rfb/rfb.c
===================================================================
--- uspace/srv/hid/rfb/rfb.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/hid/rfb/rfb.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -612,5 +612,6 @@
 	}
 
-	/* Security handshake
+	/*
+	 * Security handshake
 	 * 1 security type supported, which is 1 - None
 	 */
Index: uspace/srv/locsrv/locsrv.c
===================================================================
--- uspace/srv/locsrv/locsrv.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/locsrv/locsrv.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -67,10 +67,11 @@
 LIST_INITIALIZE(servers_list);
 
-/* Locking order:
+/*
+ * Locking order:
  *  servers_list_mutex
  *  services_list_mutex
  *  (loc_server_t *)->services_mutex
  *  create_id_mutex
- **/
+ */
 
 FIBRIL_MUTEX_INITIALIZE(services_list_mutex);
@@ -97,5 +98,6 @@
 service_id_t loc_create_id(void)
 {
-	/* TODO: allow reusing old ids after their unregistration
+	/*
+	 * TODO: allow reusing old ids after their unregistration
 	 * and implement some version of LRU algorithm, avoid overflow
 	 */
@@ -389,5 +391,6 @@
 	fibril_mutex_lock(&servers_list_mutex);
 
-	/* TODO:
+	/*
+	 * TODO:
 	 * Check that no server with name equal to
 	 * server->name is registered
@@ -1057,6 +1060,8 @@
 static void loc_get_services(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
-	/* FIXME: Use faster algorithm which can make better use
-	   of namespaces */
+	/*
+	 * FIXME: Use faster algorithm which can make better use
+	 * of namespaces
+	 */
 
 	cap_call_handle_t chandle;
Index: uspace/srv/net/tcp/test/ucall.c
===================================================================
--- uspace/srv/net/tcp/test/ucall.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/net/tcp/test/ucall.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -135,5 +135,6 @@
 
 /** Test establishing and then closing down a connection first on one side,
- * then on_the other. */
+ * then on_the other.
+ */
 PCUT_TEST(conn_est_close_seq)
 {
Index: uspace/srv/vfs/vfs_ipc.c
===================================================================
--- uspace/srv/vfs/vfs_ipc.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/srv/vfs/vfs_ipc.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -136,5 +136,6 @@
 	}
 
-	/* Now, we expect the client to send us data with the name of the file
+	/*
+	 * Now we expect the client to send us data with the name of the file
 	 * system.
 	 */