Index: uspace/app/bdsh/cmds/builtins/builtins.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/builtins.h	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ uspace/app/bdsh/cmds/builtins/builtins.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -7,5 +7,5 @@
 
 builtin_t builtins[] = {
-#include "cd/cd.def"
+#include "cd/cd_def.h"
 	{NULL, NULL, NULL, NULL}
 };
Index: uspace/app/bdsh/cmds/builtins/cd/cd.def
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd.def	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ 	(revision )
@@ -1,14 +1,0 @@
-{
-	"cd",
-	"Change the current working directory",
-	&cmd_cd,
-	&help_cmd_cd,
-	-1
-},
-{
-	"chdir",
-	NULL,
-	&cmd_cd,
-	&help_cmd_cd,
-	-1
-},
Index: uspace/app/bdsh/cmds/builtins/cd/cd_def.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
+++ uspace/app/bdsh/cmds/builtins/cd/cd_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -0,0 +1,14 @@
+{
+	"cd",
+	"Change the current working directory",
+	&cmd_cd,
+	&help_cmd_cd,
+	-1
+},
+{
+	"chdir",
+	NULL,
+	&cmd_cd,
+	&help_cmd_cd,
+	-1
+},
Index: uspace/app/bdsh/cmds/mknewcmd
===================================================================
--- uspace/app/bdsh/cmds/mknewcmd	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ uspace/app/bdsh/cmds/mknewcmd	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -91,6 +91,6 @@
 generate_code()
 {
-	echo "Creating ${OUTDIR}/${CMDNAME}.def ..."
-	cat << EOF > ${OUTDIR}/${CMDNAME}.def
+	echo "Creating ${OUTDIR}/${CMDNAME}_def.h ..."
+	cat << EOF > ${OUTDIR}/${CMDNAME}_def.h
 {
 	"${CMDNAME}",
@@ -102,5 +102,5 @@
 
 EOF
-	[ -n "${CMDALIAS}" ] && cat << EOF >> ${OUTDIR}/${CMDNAME}.def
+	[ -n "${CMDALIAS}" ] && cat << EOF >> ${OUTDIR}/${CMDNAME}_def.h
 {
 	"${CMDALIAS}",
Index: uspace/app/bdsh/cmds/modules/cat/cat.def
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.def	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ 	(revision )
@@ -1,8 +1,0 @@
-{
-	"cat",
-	"Show the contents of a file",
-	&cmd_cat,
-	&help_cmd_cat,
-	0
-},
-
Index: uspace/app/bdsh/cmds/modules/cat/cat_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
+++ uspace/app/bdsh/cmds/modules/cat/cat_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -0,0 +1,8 @@
+{
+	"cat",
+	"Show the contents of a file",
+	&cmd_cat,
+	&help_cmd_cat,
+	0
+},
+
Index: uspace/app/bdsh/cmds/modules/help/help.def
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help.def	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"help",
-	"Show help for commands",
-	&cmd_help,
-	&help_cmd_help,
-	0
-},
Index: uspace/app/bdsh/cmds/modules/help/help_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
+++ uspace/app/bdsh/cmds/modules/help/help_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -0,0 +1,7 @@
+{
+	"help",
+	"Show help for commands",
+	&cmd_help,
+	&help_cmd_help,
+	0
+},
Index: uspace/app/bdsh/cmds/modules/ls/ls.def
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.def	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ 	(revision )
@@ -1,16 +1,0 @@
-{
-	"ls",
-	"List files and directories",
-	&cmd_ls,
-	&help_cmd_ls,
-	0
-},
-
-{
-	"dir",
-	NULL,
-	&cmd_ls,
-	&help_cmd_ls,
-	0
-},
-
Index: uspace/app/bdsh/cmds/modules/ls/ls_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
+++ uspace/app/bdsh/cmds/modules/ls/ls_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -0,0 +1,16 @@
+{
+	"ls",
+	"List files and directories",
+	&cmd_ls,
+	&help_cmd_ls,
+	0
+},
+
+{
+	"dir",
+	NULL,
+	&cmd_ls,
+	&help_cmd_ls,
+	0
+},
+
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.def
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.def	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ 	(revision )
@@ -1,16 +1,0 @@
-{
-	"mkdir",
-	"Create new directories",
-	&cmd_mkdir,
-	&help_cmd_mkdir,
-	0
-},
-
-{
-	"md",
-	NULL,
-	&cmd_mkdir,
-	&help_cmd_mkdir,
-	0
-},
-
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -0,0 +1,16 @@
+{
+	"mkdir",
+	"Create new directories",
+	&cmd_mkdir,
+	&help_cmd_mkdir,
+	0
+},
+
+{
+	"md",
+	NULL,
+	&cmd_mkdir,
+	&help_cmd_mkdir,
+	0
+},
+
Index: uspace/app/bdsh/cmds/modules/modules.h
===================================================================
--- uspace/app/bdsh/cmds/modules/modules.h	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ uspace/app/bdsh/cmds/modules/modules.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -32,12 +32,12 @@
 
 module_t modules[] = {
-#include "help/help.def"
-#include "quit/quit.def"
-#include "mkdir/mkdir.def"
-#include "rm/rm.def"
-#include "cat/cat.def"
-#include "touch/touch.def"
-#include "ls/ls.def"
-#include "pwd/pwd.def"
+#include "help/help_def.h"
+#include "quit/quit_def.h"
+#include "mkdir/mkdir_def.h"
+#include "rm/rm_def.h"
+#include "cat/cat_def.h"
+#include "touch/touch_def.h"
+#include "ls/ls_def.h"
+#include "pwd/pwd_def.h"
 	{NULL, NULL, NULL, NULL}
 };
Index: uspace/app/bdsh/cmds/modules/pwd/pwd.def
===================================================================
--- uspace/app/bdsh/cmds/modules/pwd/pwd.def	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"pwd",
-	"Prints the current working directory",
-	&cmd_pwd,
-	&help_cmd_pwd,
-	-1
-},
Index: uspace/app/bdsh/cmds/modules/pwd/pwd_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/pwd/pwd_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
+++ uspace/app/bdsh/cmds/modules/pwd/pwd_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -0,0 +1,7 @@
+{
+	"pwd",
+	"Prints the current working directory",
+	&cmd_pwd,
+	&help_cmd_pwd,
+	-1
+},
Index: uspace/app/bdsh/cmds/modules/quit/quit.def
===================================================================
--- uspace/app/bdsh/cmds/modules/quit/quit.def	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ 	(revision )
@@ -1,14 +1,0 @@
-{
-	"quit",
-	"Exit the console",
-	&cmd_quit,
-	&help_cmd_quit,
-	-1
-},
-{
-	"exit",
-	NULL,
-	&cmd_quit,
-	&help_cmd_quit,
-	-1
-},
Index: uspace/app/bdsh/cmds/modules/quit/quit_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/quit/quit_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
+++ uspace/app/bdsh/cmds/modules/quit/quit_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -0,0 +1,14 @@
+{
+	"quit",
+	"Exit the console",
+	&cmd_quit,
+	&help_cmd_quit,
+	-1
+},
+{
+	"exit",
+	NULL,
+	&cmd_quit,
+	&help_cmd_quit,
+	-1
+},
Index: uspace/app/bdsh/cmds/modules/rm/rm.def
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.def	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ 	(revision )
@@ -1,16 +1,0 @@
-{
-	"rm",
-	"Remove files and directories",
-	&cmd_rm,
-	&help_cmd_rm,
-	0
-},
-
-{
-	"del",
-	NULL,
-	&cmd_rm,
-	&help_cmd_rm,
-	0
-},
-
Index: uspace/app/bdsh/cmds/modules/rm/rm_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
+++ uspace/app/bdsh/cmds/modules/rm/rm_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -0,0 +1,16 @@
+{
+	"rm",
+	"Remove files and directories",
+	&cmd_rm,
+	&help_cmd_rm,
+	0
+},
+
+{
+	"del",
+	NULL,
+	&cmd_rm,
+	&help_cmd_rm,
+	0
+},
+
Index: uspace/app/bdsh/cmds/modules/touch/touch.def
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.def	(revision 88944695970ebfd82dce23b26a27ded9fda43fca)
+++ 	(revision )
@@ -1,8 +1,0 @@
-{
-	"touch",
-	"Create files or update access times",
-	&cmd_touch,
-	&help_cmd_touch,
-	0
-},
-
Index: uspace/app/bdsh/cmds/modules/touch/touch_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
+++ uspace/app/bdsh/cmds/modules/touch/touch_def.h	(revision a56f4b291fe3ec936421cc5ce9dceedba5d796a7)
@@ -0,0 +1,8 @@
+{
+	"touch",
+	"Create files or update access times",
+	&cmd_touch,
+	&help_cmd_touch,
+	0
+},
+