Index: uspace/srv/hid/compositor/compositor.c
===================================================================
--- uspace/srv/hid/compositor/compositor.c	(revision e897527842650001c9fb751fa6a1792a272858d7)
+++ 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 e897527842650001c9fb751fa6a1792a272858d7)
+++ uspace/srv/hid/rfb/rfb.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -612,5 +612,6 @@
 	}
 
-	/* Security handshake
+	/*
+	 * Security handshake
 	 * 1 security type supported, which is 1 - None
 	 */