Index: uspace/app/bdsh/cmds/modules/cat/cat.h
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.h	(revision e4fbccd271f2e38e9a11f4feff3d28b549716a1f)
+++ uspace/app/bdsh/cmds/modules/cat/cat.h	(revision 081d60fdfc7c02f01d58ee50b7f101834229024b)
@@ -4,5 +4,4 @@
 /* Prototypes for the cat command, excluding entry points */
 
-static unsigned int cat_file(const char *, size_t, bool);
 
 #endif /* CAT_H */
Index: uspace/app/bdsh/cmds/modules/help/help.h
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help.h	(revision e4fbccd271f2e38e9a11f4feff3d28b549716a1f)
+++ uspace/app/bdsh/cmds/modules/help/help.h	(revision 081d60fdfc7c02f01d58ee50b7f101834229024b)
@@ -3,5 +3,4 @@
 
 /* Prototypes for the help command (excluding entry points) */
-static int is_mod_or_builtin(char *);
 
 #endif
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.h	(revision e4fbccd271f2e38e9a11f4feff3d28b549716a1f)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.h	(revision 081d60fdfc7c02f01d58ee50b7f101834229024b)
@@ -4,5 +4,4 @@
 /* Prototypes for the mkdir command, excluding entry points */
 
-static unsigned int create_directory(const char *, unsigned int);
 #endif /* MKDIR_H */
 
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision e4fbccd271f2e38e9a11f4feff3d28b549716a1f)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 081d60fdfc7c02f01d58ee50b7f101834229024b)
@@ -46,6 +46,4 @@
 #define RM_VERSION "0.0.1"
 
-static rm_job_t rm;
-
 static struct option const long_options[] = {
 	{ "help", no_argument, 0, 'h' },
@@ -57,4 +55,38 @@
 };
 
+/* Return values for rm_scope() */
+#define RM_BOGUS 0
+#define RM_FILE  1
+#define RM_DIR   2
+
+/* Flags for rm_update() */
+#define _RM_ENTRY   0
+#define _RM_ADVANCE 1
+#define _RM_REWIND  2
+#define _RM_EXIT    3
+
+/* A simple job structure */
+typedef struct {
+	/* Options set at run time */
+	unsigned int force;      /* -f option */
+	unsigned int recursive;  /* -r option */
+	unsigned int safe;       /* -s option */
+
+	/* Keeps track of the job in progress */
+	int advance; /* How far deep we've gone since entering */
+	DIR *entry;  /* Entry point to the tree being removed */
+	char *owd;   /* Where we were when we invoked rm */
+	char *cwd;   /* Current directory being transversed */
+	char *nwd;   /* Next directory to be transversed */
+
+	/* Counters */
+	int f_removed; /* Number of files unlinked */
+	int d_removed; /* Number of directories unlinked */
+} rm_job_t;
+
+static rm_job_t rm;
+
+static unsigned int rm_recursive(const char *);
+
 static unsigned int rm_start(rm_job_t *rm)
 {
@@ -95,4 +127,33 @@
 	if (NULL != rm->cwd)
 		free(rm->cwd);
+}
+
+static unsigned int rm_single(const char *path)
+{
+	if (unlink(path)) {
+		cli_error(CL_EFAIL, "rm: could not remove file %s", path);
+		return 1;
+	}
+	return 0;
+}
+
+static unsigned int rm_scope(const char *path)
+{
+	int fd;
+	DIR *dirp;
+
+	dirp = opendir(path);
+	if (dirp) {
+		closedir(dirp);
+		return RM_DIR;
+	}
+
+	fd = open(path, O_RDONLY);
+	if (fd > 0) {
+		close(fd);
+		return RM_FILE;
+	}
+
+	return RM_BOGUS;
 }
 
@@ -154,33 +215,4 @@
 
 	return ret + 1;
-}
-
-static unsigned int rm_single(const char *path)
-{
-	if (unlink(path)) {
-		cli_error(CL_EFAIL, "rm: could not remove file %s", path);
-		return 1;
-	}
-	return 0;
-}
-
-static unsigned int rm_scope(const char *path)
-{
-	int fd;
-	DIR *dirp;
-
-	dirp = opendir(path);
-	if (dirp) {
-		closedir(dirp);
-		return RM_DIR;
-	}
-
-	fd = open(path, O_RDONLY);
-	if (fd > 0) {
-		close(fd);
-		return RM_FILE;
-	}
-
-	return RM_BOGUS;
 }
 
Index: uspace/app/bdsh/cmds/modules/rm/rm.h
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.h	(revision e4fbccd271f2e38e9a11f4feff3d28b549716a1f)
+++ uspace/app/bdsh/cmds/modules/rm/rm.h	(revision 081d60fdfc7c02f01d58ee50b7f101834229024b)
@@ -2,41 +2,5 @@
 #define RM_H
 
-/* Return values for rm_scope() */
-#define RM_BOGUS 0
-#define RM_FILE  1
-#define RM_DIR   2
-
-/* Flags for rm_update() */
-#define _RM_ENTRY   0
-#define _RM_ADVANCE 1
-#define _RM_REWIND  2
-#define _RM_EXIT    3
-
-/* A simple job structure */
-typedef struct {
-	/* Options set at run time */
-	unsigned int force;      /* -f option */
-	unsigned int recursive;  /* -r option */
-	unsigned int safe;       /* -s option */
-
-	/* Keeps track of the job in progress */
-	int advance; /* How far deep we've gone since entering */
-	DIR *entry;  /* Entry point to the tree being removed */
-	char *owd;   /* Where we were when we invoked rm */
-	char *cwd;   /* Current directory being transversed */
-	char *nwd;   /* Next directory to be transversed */
-
-	/* Counters */
-	int f_removed; /* Number of files unlinked */
-	int d_removed; /* Number of directories unlinked */
-} rm_job_t;
-
-
 /* Prototypes for the rm command, excluding entry points */
-static unsigned int rm_start(rm_job_t *);
-static void rm_end(rm_job_t *rm);
-static unsigned int rm_recursive(const char *);
-static unsigned int rm_single(const char *);
-static unsigned int rm_scope(const char *);
 
 #endif /* RM_H */
Index: uspace/app/bdsh/cmds/modules/sleep/sleep.c
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision e4fbccd271f2e38e9a11f4feff3d28b549716a1f)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision 081d60fdfc7c02f01d58ee50b7f101834229024b)
@@ -48,7 +48,7 @@
 		help_cmd_sleep(HELP_SHORT);
 		printf(
-		"Usage:  %s <duration>\n"
-		"The duration is a decimal number of seconds.\n",
-		cmdname);
+		    "Usage:  %s <duration>\n"
+		    "The duration is a decimal number of seconds.\n",
+		    cmdname);
 	}
 
@@ -62,5 +62,5 @@
  * @return EOK if conversion was successful.
  */
-static int str_useconds_t(const char *nptr, useconds_t *result)
+static int decimal_to_useconds(const char *nptr, useconds_t *result)
 {
 	int ret;
@@ -125,5 +125,5 @@
 	}
 
-	ret = str_useconds_t(argv[1], &duration);
+	ret = decimal_to_useconds(argv[1], &duration);
 	if (ret != EOK) {
 		printf("%s - invalid duration.\n", cmdname);
Index: uspace/app/bdsh/cmds/modules/sleep/sleep.h
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep.h	(revision e4fbccd271f2e38e9a11f4feff3d28b549716a1f)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep.h	(revision 081d60fdfc7c02f01d58ee50b7f101834229024b)
@@ -4,5 +4,4 @@
 /* Prototypes for the sleep command, excluding entry points */
 
-static int str_useconds_t(const char *nptr, useconds_t *result);
 
 #endif /* SLEEP_H */