Index: uspace/app/bdsh/cmds/builtins/cd/cd.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -43,5 +43,5 @@
 static char * cmdname = "cd";
 
-void * help_cmd_cd(unsigned int level)
+void help_cmd_cd(unsigned int level)
 {
 	if (level == HELP_SHORT) {
@@ -54,10 +54,10 @@
 	}
 
-	return CMD_VOID;
+	return;
 }
 
 /* This is a very rudamentary 'cd' command. It is not 'link smart' (yet) */
 
-int * cmd_cd(char **argv, cliuser_t *usr)
+int cmd_cd(char **argv, cliuser_t *usr)
 {
 	int argc, rc = 0;
Index: uspace/app/bdsh/cmds/builtins/cd/entry.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/entry.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/builtins/cd/entry.h	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -5,6 +5,6 @@
 
 /* Entry points for the cd command */
-extern void * help_cmd_cd(unsigned int);
-extern int * cmd_cd(char **, cliuser_t *);
+extern void help_cmd_cd(unsigned int);
+extern int cmd_cd(char **, cliuser_t *);
 
 #endif
Index: uspace/app/bdsh/cmds/cmds.h
===================================================================
--- uspace/app/bdsh/cmds/cmds.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/cmds.h	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -20,15 +20,14 @@
 
 /* Return macros for int type entry points */
-#define CMD_FAILURE (int*)1
+#define CMD_FAILURE 1
 #define CMD_SUCCESS 0
-#define CMD_VOID (void *)NULL
 
 /* Types for module command entry and help */
-typedef int * (* mod_entry_t)(char **);
-typedef void * (* mod_help_t)(unsigned int);
+typedef int (* mod_entry_t)(char **);
+typedef void (* mod_help_t)(unsigned int);
 
 /* Built-in commands need to be able to modify cliuser_t */
-typedef int * (* builtin_entry_t)(char **, cliuser_t *);
-typedef void * (* builtin_help_t)(unsigned int);
+typedef int (* builtin_entry_t)(char **, cliuser_t *);
+typedef void (* builtin_help_t)(unsigned int);
 
 /* Module structure */
Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -60,5 +60,5 @@
 
 /* Dispays help for cat in various levels */
-void * help_cmd_cat(unsigned int level)
+void help_cmd_cat(unsigned int level)
 {
 	if (level == HELP_SHORT) {
@@ -79,5 +79,5 @@
 	}
 
-	return CMD_VOID;
+	return;
 }
 
@@ -128,5 +128,5 @@
 
 /* Main entry point for cat, accepts an array of arguments */
-int * cmd_cat(char **argv)
+int cmd_cat(char **argv)
 {
 	unsigned int argc, i, ret = 0, buffer = 0;
Index: uspace/app/bdsh/cmds/modules/cat/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/entry.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/cat/entry.h	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -3,6 +3,6 @@
 
 /* Entry points for the cat command */
-extern int * cmd_cat(char **);
-extern void * help_cmd_cat(unsigned int);
+extern int cmd_cat(char **);
+extern void help_cmd_cat(unsigned int);
 
 #endif /* CAT_ENTRY_H */
Index: uspace/app/bdsh/cmds/modules/help/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/help/entry.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/help/entry.h	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -3,6 +3,6 @@
 
 /* Entry points for the help command */
-extern void * help_cmd_help(unsigned int);
-extern int * cmd_help(char *[]);
+extern void help_cmd_help(unsigned int);
+extern int cmd_help(char *[]);
 
 #endif
Index: uspace/app/bdsh/cmds/modules/help/help.c
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help.c	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/help/help.c	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -70,5 +70,5 @@
 }
 
-void *help_cmd_help(unsigned int level)
+void help_cmd_help(unsigned int level)
 {
 	if (level == HELP_SHORT) {
@@ -87,8 +87,8 @@
 	}
 
-	return CMD_VOID;
+	return;
 }
 
-int *cmd_help(char *argv[])
+int cmd_help(char *argv[])
 {
 	module_t *mod;
Index: uspace/app/bdsh/cmds/modules/ls/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/entry.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/ls/entry.h	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -3,6 +3,6 @@
 
 /* Entry points for the ls command */
-extern int * cmd_ls(char **);
-extern void * help_cmd_ls(unsigned int);
+extern int cmd_ls(char **);
+extern void help_cmd_ls(unsigned int);
 
 #endif /* LS_ENTRY_H */
Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -133,5 +133,5 @@
 }
 
-void * help_cmd_ls(unsigned int level)
+void help_cmd_ls(unsigned int level)
 {
 	if (level == HELP_SHORT) {
@@ -143,8 +143,8 @@
 	}
 
-	return CMD_VOID;
+	return;
 }
 
-int * cmd_ls(char **argv)
+int cmd_ls(char **argv)
 {
 	unsigned int argc;
Index: uspace/app/bdsh/cmds/modules/mkdir/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/entry.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/mkdir/entry.h	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -3,6 +3,6 @@
 
 /* Entry points for the mkdir command */
-extern int * cmd_mkdir(char **);
-extern void * help_cmd_mkdir(unsigned int);
+extern int cmd_mkdir(char **);
+extern void help_cmd_mkdir(unsigned int);
 
 #endif /* MKDIR_ENTRY_H */
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -61,5 +61,5 @@
 
 
-void * help_cmd_mkdir(unsigned int level)
+void help_cmd_mkdir(unsigned int level)
 {
 	if (level == HELP_SHORT) {
@@ -80,5 +80,5 @@
 	}
 
-	return CMD_VOID;
+	return;
 }
 
@@ -182,5 +182,5 @@
 }
 
-int * cmd_mkdir(char **argv)
+int cmd_mkdir(char **argv)
 {
 	unsigned int argc, create_parents = 0, i, ret = 0, follow = 0;
Index: uspace/app/bdsh/cmds/modules/pwd/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/pwd/entry.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/pwd/entry.h	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -5,6 +5,6 @@
 
 /* Entry points for the pwd command */
-extern void * help_cmd_pwd(unsigned int);
-extern int * cmd_pwd(char **);
+extern void help_cmd_pwd(unsigned int);
+extern int cmd_pwd(char **);
 
 #endif
Index: uspace/app/bdsh/cmds/modules/pwd/pwd.c
===================================================================
--- uspace/app/bdsh/cmds/modules/pwd/pwd.c	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/pwd/pwd.c	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -40,11 +40,11 @@
 static char * cmdname = "pwd";
 
-void * help_cmd_pwd(unsigned int level)
+void help_cmd_pwd(unsigned int level)
 {
 	printf("`%s' prints your current working directory.\n", cmdname);
-	return CMD_VOID;
+	return;
 }
 
-int * cmd_pwd(char *argv[])
+int cmd_pwd(char *argv[])
 {
 	char *buff;
Index: uspace/app/bdsh/cmds/modules/quit/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/quit/entry.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/quit/entry.h	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -3,6 +3,6 @@
 
 /* Entry points for the quit command */
-extern void * help_cmd_quit(unsigned int);
-extern int * cmd_quit(char *[]);
+extern void help_cmd_quit(unsigned int);
+extern int cmd_quit(char *[]);
 
 #endif
Index: uspace/app/bdsh/cmds/modules/quit/quit.c
===================================================================
--- uspace/app/bdsh/cmds/modules/quit/quit.c	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/quit/quit.c	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -40,13 +40,13 @@
 extern const char *progname;
 
-void * help_cmd_quit(unsigned int level)
+void help_cmd_quit(unsigned int level)
 {
 	printf("Type `%s' to exit %s\n", cmdname, progname);
-	return CMD_VOID;
+	return;
 }
 
 /* Quits the program and returns the status of whatever command
  * came before invoking 'quit' */
-int * cmd_quit(char *argv[])
+int cmd_quit(char *argv[])
 {
 	/* Inform that we're outta here */
Index: uspace/app/bdsh/cmds/modules/rm/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/entry.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/rm/entry.h	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -3,6 +3,6 @@
 
 /* Entry points for the rm command */
-extern int * cmd_rm(char **);
-extern void * help_cmd_rm(unsigned int);
+extern int cmd_rm(char **);
+extern void help_cmd_rm(unsigned int);
 
 #endif /* RM_ENTRY_H */
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -145,5 +145,5 @@
 
 /* Dispays help for rm in various levels */
-void * help_cmd_rm(unsigned int level)
+void help_cmd_rm(unsigned int level)
 {
 	if (level == HELP_SHORT) {
@@ -162,9 +162,9 @@
 		cmdname, cmdname);
 	}
-	return CMD_VOID;
+	return;
 }
 
 /* Main entry point for rm, accepts an array of arguments */
-int * cmd_rm(char **argv)
+int cmd_rm(char **argv)
 {
 	unsigned int argc;
Index: uspace/app/bdsh/cmds/modules/touch/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/entry.h	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/touch/entry.h	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -3,6 +3,6 @@
 
 /* Entry points for the touch command */
-extern int * cmd_touch(char **);
-extern void * help_cmd_touch(unsigned int);
+extern int cmd_touch(char **);
+extern void help_cmd_touch(unsigned int);
 
 #endif /* TOUCH_ENTRY_H */
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 211b0c132c099449ef7376d8f483e96f3388351f)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
@@ -49,5 +49,5 @@
 
 /* Dispays help for touch in various levels */
-void * help_cmd_touch(unsigned int level)
+void help_cmd_touch(unsigned int level)
 {
 	if (level == HELP_SHORT) {
@@ -59,9 +59,9 @@
 	}
 
-	return CMD_VOID;
+	return;
 }
 
 /* Main entry point for touch, accepts an array of arguments */
-int * cmd_touch(char **argv)
+int cmd_touch(char **argv)
 {
 	unsigned int argc, i = 0, ret = 0;