Index: uspace/app/bdsh/cmds/builtin_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/builtin_cmds.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/builtin_cmds.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -27,6 +27,8 @@
  */
 
-/* Almost identical (for now) to mod_cmds.c , however this will not be the case
- * soon as builtin_t is going to grow way beyond module_t */
+/*
+ * Almost identical (for now) to mod_cmds.c, however this will not be the case
+ * soon as builtin_t is going to grow way beyond module_t
+ */
 
 #include <stdio.h>
Index: uspace/app/bdsh/cmds/builtins/batch/batch.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/batch/batch.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/builtins/batch/batch.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -66,6 +66,7 @@
 }
 
-/* Main entry point for batch, accepts an array of arguments and a
- * pointer to the cliuser_t structure */
+/** Main entry point for batch, accepts an array of arguments and a
+ * pointer to the cliuser_t structure
+ */
 int cmd_batch(char **argv, cliuser_t *usr)
 {
Index: uspace/app/bdsh/cmds/builtins/cd/cd.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -41,5 +41,6 @@
 static const char *cmdname = "cd";
 
-/* Previous directory variables.
+/*
+ * Previous directory variables.
  *
  * Declaring them static to avoid many "== NULL" checks.
@@ -101,8 +102,10 @@
 	}
 
-	/* We don't yet play nice with whitespace, a getopt implementation should
+	/*
+	 * We don't yet play nice with whitespace, a getopt implementation should
 	 * protect "quoted\ destination" as a single argument. Its not our job to
 	 * look for && || or redirection as the tokenizer should have done that
-	 * (currently, it does not) */
+	 * (currently, it does not)
+	 */
 
 	if (argc > 2) {
Index: uspace/app/bdsh/cmds/builtins/exit/exit.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/exit/exit.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/builtins/exit/exit.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -44,6 +44,7 @@
 }
 
-/* Quits the program and returns the status of whatever command
- * came before invoking 'quit' */
+/** Quits the program and returns the status of whatever command
+ * came before invoking 'quit'
+ */
 int cmd_exit(char *argv[], cliuser_t *usr)
 {
Index: uspace/app/bdsh/cmds/cmds.h
===================================================================
--- uspace/app/bdsh/cmds/cmds.h	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/cmds.h	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -76,6 +76,8 @@
 } builtin_t;
 
-/* Declared in cmds/modules/modules.h and cmds/builtins/builtins.h
- * respectively */
+/*
+ * Declared in cmds/modules/modules.h and cmds/builtins/builtins.h
+ * respectively
+ */
 extern module_t modules[];
 extern builtin_t builtins[];
Index: uspace/app/bdsh/cmds/mod_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/mod_cmds.c	(revision 47e00b8364871fedb5a2508cfc367b91b0cb8e63)
+++ uspace/app/bdsh/cmds/mod_cmds.c	(revision a4eb3ba2b6a831a2a639dfe74c4deb2ca435b91c)
@@ -27,5 +27,6 @@
  */
 
-/* NOTES:
+/*
+ * NOTES:
  * module_* functions are pretty much identical to builtin_* functions at this
  * point. On the surface, it would appear that making each function dual purpose
@@ -37,9 +38,12 @@
  *
  * To keep things easy to hack, everything is separated. In reality this only adds
- * 6 - 8 extra functions, but keeps each function very easy to read and modify. */
+ * 6 - 8 extra functions, but keeps each function very easy to read and modify.
+ */
 
-/* TODO:
+/*
+ * TODO:
  * Many of these could be unsigned, provided the modules and builtins themselves
- * can follow suit. Long term goal. */
+ * can follow suit. Long term goal.
+ */
 
 #include <stdio.h>
@@ -53,6 +57,8 @@
 extern volatile unsigned int cli_interactive;
 
-/* Checks if an entry function matching command exists in modules[], if so
- * its position in the array is returned */
+/** Checks if an entry function matching command exists in modules[]
+ *
+ * If so, its position in the array is returned
+ */
 int is_module(const char *command)
 {
@@ -71,6 +77,8 @@
 }
 
-/* Checks if a module is an alias (sharing an entry point with another
- * module). Returns 1 if so */
+/*
+ * Checks if a module is an alias (sharing an entry point with another
+ * module). Returns 1 if so
+ */
 int is_module_alias(const char *command)
 {
@@ -105,6 +113,8 @@
 
 
-/* Invokes the 'help' entry function for the module at position (int) module,
- * which wants an unsigned int to determine brief or extended display. */
+/** Invokes the 'help' entry function for the module at position (int) module
+ *
+ * which wants an unsigned int to determine brief or extended display.
+ */
 int help_module(int module, unsigned int extended)
 {
@@ -121,6 +131,8 @@
 }
 
-/* Invokes the module entry point modules[module], passing argv[] as an argument
- * stack. */
+/** Invokes the module entry point modules[module]
+ *
+ * passing argv[] as an argument stack.
+ */
 int run_module(int module, char *argv[], iostate_t *new_iostate)
 {
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;