Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -274,6 +274,8 @@
 						break;
 					} else if (c == U_SPECIAL && offset + 2 >= (size_t)bytes) {
-						/* If an extended character is cut off due to the size of the buffer,
-						   we will copy it over to the next buffer so it can be read correctly. */
+						/*
+						 * If an extended character is cut off due to the size of the buffer,
+						 * we will copy it over to the next buffer so it can be read correctly.
+						 */
 						copied_bytes = bytes - offset + 1;
 						memcpy(buff, buff + offset - 1, copied_bytes);
Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -207,5 +207,6 @@
 			/* e.g. cp file_name /data/ */
 
-			/* dest is a directory,
+			/*
+			 * dest is a directory,
 			 * append the src filename to it.
 			 */
@@ -231,5 +232,6 @@
 			/* e.g. cp file_name existing_file */
 
-			/* dest already exists,
+			/*
+			 * dest already exists,
 			 * if force is set we will try to remove it.
 			 * if interactive is set user input is required.
@@ -298,5 +300,6 @@
 			if (str_cmp(src_dirname, "..") &&
 			    str_cmp(src_dirname, ".")) {
-				/* The last component of src_path is
+				/*
+				 * The last component of src_path is
 				 * not '.' or '..'
 				 */
@@ -314,5 +317,6 @@
 		default:
 		case TYPE_NONE:
-			/* dest does not exists, this means the user wants
+			/*
+			 * dest does not exists, this means the user wants
 			 * to specify the name of the destination directory
 			 *
@@ -336,5 +340,6 @@
 		}
 
-		/* Copy every single directory entry of src into the
+		/*
+		 * Copy every single directory entry of src into the
 		 * destination directory.
 		 */
Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -27,7 +27,9 @@
  */
 
-/* NOTE:
+/*
+ * NOTE:
  * This is a bit of an ugly hack, working around the absence of fstat / etc.
- * As more stuff is completed and exposed in libc, this will improve */
+ * As more stuff is completed and exposed in libc, this will improve
+ */
 
 #include <errno.h>
Index: uspace/app/bdsh/cmds/modules/module_aliases.h
===================================================================
--- uspace/app/bdsh/cmds/modules/module_aliases.h	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/modules/module_aliases.h	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -30,13 +30,17 @@
 #define MODULE_ALIASES_H
 
-/* Modules that declare multiple names for themselves but use the
+/*
+ * Modules that declare multiple names for themselves but use the
  * same entry functions are aliases. This array helps to determine if
  * a module is an alias, as such it can be invoked differently.
- * format is alias , real_name */
+ * format is alias , real_name
+ */
 
-/* So far, this is only used in the help display but could be used to
+/*
+ * So far, this is only used in the help display but could be used to
  * handle a module differently even prior to reaching its entry code.
  * For instance, 'exit' could behave differently than 'quit', prior to
- * the entry point being reached. */
+ * the entry point being reached.
+ */
 
 const char *mod_aliases[] = {
Index: uspace/app/bdsh/cmds/modules/modules.h
===================================================================
--- uspace/app/bdsh/cmds/modules/modules.h	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/modules/modules.h	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -30,5 +30,6 @@
 #define MODULES_H
 
-/* Each built in function has two files, one being an entry.h file which
+/*
+ * Each built in function has two files, one being an entry.h file which
  * prototypes the run/help entry functions, the other being a .def file
  * which fills the modules[] array according to the cmd_t structure
@@ -40,5 +41,6 @@
  *
  * NOTE: See module_ aliases.h as well, this is where aliases (commands that
- * share an entry point with others) are indexed */
+ * share an entry point with others) are indexed
+ */
 
 #include "config.h"
@@ -64,7 +66,9 @@
 #include "cmp/entry.h"
 
-/* Each .def function fills the module_t struct with the individual name, entry
+/*
+ * Each .def function fills the module_t struct with the individual name, entry
  * point, help entry point, etc. You can use config.h to control what modules
- * are loaded based on what libraries exist on the system. */
+ * are loaded based on what libraries exist on the system.
+ */
 
 module_t modules[] = {
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -95,6 +95,8 @@
 	rm->safe = 0;
 
-	/* Make sure we can allocate enough memory to store
-	 * what is needed in the job structure */
+	/*
+	 * Make sure we can allocate enough memory to store
+	 * what is needed in the job structure
+	 */
 	if (NULL == (rm->nwd = (char *) malloc(PATH_MAX)))
 		return 0;