Index: uspace/app/bdsh/cmds/builtins/batch/batch_def.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/batch/batch_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"batch",
-	"Issue batch of commands",
-	&cmd_batch,
-	&help_cmd_batch,
-	0
-},
Index: uspace/app/bdsh/cmds/builtins/batch/batch_def.inc
===================================================================
--- uspace/app/bdsh/cmds/builtins/batch/batch_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/builtins/batch/batch_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"batch",
+	"Issue batch of commands",
+	&cmd_batch,
+	&help_cmd_batch,
+	0
+},
Index: uspace/app/bdsh/cmds/builtins/builtins.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/builtins.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ uspace/app/bdsh/cmds/builtins/builtins.h	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -9,7 +9,7 @@
 
 builtin_t builtins[] = {
-#include "batch/batch_def.h"
-#include "cd/cd_def.h"
-#include "exit/exit_def.h"
+#include "batch/batch_def.inc"
+#include "cd/cd_def.inc"
+#include "exit/exit_def.inc"
 	{NULL, NULL, NULL, NULL, 0}
 };
Index: uspace/app/bdsh/cmds/builtins/cd/cd_def.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"cd",
-	"Change the current working directory",
-	&cmd_cd,
-	&help_cmd_cd,
-	0
-},
Index: uspace/app/bdsh/cmds/builtins/cd/cd_def.inc
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/builtins/cd/cd_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"cd",
+	"Change the current working directory",
+	&cmd_cd,
+	&help_cmd_cd,
+	0
+},
Index: uspace/app/bdsh/cmds/builtins/exit/exit_def.h
===================================================================
--- uspace/app/bdsh/cmds/builtins/exit/exit_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"exit",
-	"Exit the shell",
-	&cmd_exit,
-	&help_cmd_exit,
-	0
-},
Index: uspace/app/bdsh/cmds/builtins/exit/exit_def.inc
===================================================================
--- uspace/app/bdsh/cmds/builtins/exit/exit_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/builtins/exit/exit_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"exit",
+	"Exit the shell",
+	&cmd_exit,
+	&help_cmd_exit,
+	0
+},
Index: uspace/app/bdsh/cmds/mknewcmd
===================================================================
--- uspace/app/bdsh/cmds/mknewcmd	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ uspace/app/bdsh/cmds/mknewcmd	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -90,6 +90,6 @@
 generate_code()
 {
-	echo "Creating ${OUTDIR}/${CMDNAME}_def.h ..."
-	cat << EOF > ${OUTDIR}/${CMDNAME}_def.h
+	echo "Creating ${OUTDIR}/${CMDNAME}_def.inc ..."
+	cat << EOF > ${OUTDIR}/${CMDNAME}_def.inc
 {
 	"${CMDNAME}",
@@ -100,5 +100,5 @@
 
 EOF
-	[ -n "${CMDALIAS}" ] && cat << EOF >> ${OUTDIR}/${CMDNAME}_def.h
+	[ -n "${CMDALIAS}" ] && cat << EOF >> ${OUTDIR}/${CMDNAME}_def.inc
 {
 	"${CMDALIAS}",
Index: uspace/app/bdsh/cmds/modules/cat/cat_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"cat",
-	"Show the contents of a file",
-	&cmd_cat,
-	&help_cmd_cat,
-},
-
Index: uspace/app/bdsh/cmds/modules/cat/cat_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/cat/cat_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"cat",
+	"Show the contents of a file",
+	&cmd_cat,
+	&help_cmd_cat,
+},
+
Index: uspace/app/bdsh/cmds/modules/cmp/cmp_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/cmp/cmp_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"cmp",
-	"Compare the contents of two files",
-	&cmd_cmp,
-	&help_cmd_cmp,
-},
-
Index: uspace/app/bdsh/cmds/modules/cmp/cmp_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/cmp/cmp_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/cmp/cmp_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"cmp",
+	"Compare the contents of two files",
+	&cmd_cmp,
+	&help_cmd_cmp,
+},
+
Index: uspace/app/bdsh/cmds/modules/cp/cp_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"cp",
-	"Copy files and directories",
-	&cmd_cp,
-	&help_cmd_cp,
-},
-
Index: uspace/app/bdsh/cmds/modules/cp/cp_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/cp/cp_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"cp",
+	"Copy files and directories",
+	&cmd_cp,
+	&help_cmd_cp,
+},
+
Index: uspace/app/bdsh/cmds/modules/echo/echo_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/echo/echo_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"echo",
-	"Prints arguments as they are",
-	&cmd_echo,
-	&help_cmd_echo,
-},
-
Index: uspace/app/bdsh/cmds/modules/echo/echo_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/echo/echo_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/echo/echo_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"echo",
+	"Prints arguments as they are",
+	&cmd_echo,
+	&help_cmd_echo,
+},
+
Index: uspace/app/bdsh/cmds/modules/help/help_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,6 +1,0 @@
-{
-	"help",
-	"Show help for commands",
-	&cmd_help,
-	&help_cmd_help,
-},
Index: uspace/app/bdsh/cmds/modules/help/help_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/help/help_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,6 @@
+{
+	"help",
+	"Show help for commands",
+	&cmd_help,
+	&help_cmd_help,
+},
Index: uspace/app/bdsh/cmds/modules/kcon/kcon_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/kcon/kcon_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"kcon",
-	"Switch to kernel console",
-	&cmd_kcon,
-	&help_cmd_kcon,
-},
-
Index: uspace/app/bdsh/cmds/modules/kcon/kcon_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/kcon/kcon_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/kcon/kcon_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"kcon",
+	"Switch to kernel console",
+	&cmd_kcon,
+	&help_cmd_kcon,
+},
+
Index: uspace/app/bdsh/cmds/modules/ls/ls_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,6 +1,0 @@
-{
-	"ls",
-	"List files and directories",
-	&cmd_ls,
-	&help_cmd_ls,
-},
Index: uspace/app/bdsh/cmds/modules/ls/ls_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/ls/ls_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,6 @@
+{
+	"ls",
+	"List files and directories",
+	&cmd_ls,
+	&help_cmd_ls,
+},
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,8 +1,0 @@
-{
-	"mkdir",
-	"Create new directories",
-	&cmd_mkdir,
-	&help_cmd_mkdir,
-},
-
-
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,8 @@
+{
+	"mkdir",
+	"Create new directories",
+	&cmd_mkdir,
+	&help_cmd_mkdir,
+},
+
+
Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mkfile/mkfile_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,8 +1,0 @@
-{
-	"mkfile",
-	"Create new file",
-	&cmd_mkfile,
-	&help_cmd_mkfile,
-},
-
-
Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/mkfile/mkfile_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/mkfile/mkfile_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,8 @@
+{
+	"mkfile",
+	"Create new file",
+	&cmd_mkfile,
+	&help_cmd_mkfile,
+},
+
+
Index: uspace/app/bdsh/cmds/modules/modules.h
===================================================================
--- uspace/app/bdsh/cmds/modules/modules.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ uspace/app/bdsh/cmds/modules/modules.h	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -69,21 +69,21 @@
 
 module_t modules[] = {
-#include "help/help_def.h"
-#include "mkdir/mkdir_def.h"
-#include "mkfile/mkfile_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"
-#include "sleep/sleep_def.h"
-#include "cp/cp_def.h"
-#include "mv/mv_def.h"
-#include "mount/mount_def.h"
-#include "unmount/unmount_def.h"
-#include "kcon/kcon_def.h"
-#include "printf/printf_def.h"
-#include "echo/echo_def.h"
-#include "cmp/cmp_def.h"
+#include "help/help_def.inc"
+#include "mkdir/mkdir_def.inc"
+#include "mkfile/mkfile_def.inc"
+#include "rm/rm_def.inc"
+#include "cat/cat_def.inc"
+#include "touch/touch_def.inc"
+#include "ls/ls_def.inc"
+#include "pwd/pwd_def.inc"
+#include "sleep/sleep_def.inc"
+#include "cp/cp_def.inc"
+#include "mv/mv_def.inc"
+#include "mount/mount_def.inc"
+#include "unmount/unmount_def.inc"
+#include "kcon/kcon_def.inc"
+#include "printf/printf_def.inc"
+#include "echo/echo_def.inc"
+#include "cmp/cmp_def.inc"
 
 	{NULL, NULL, NULL, NULL}
Index: uspace/app/bdsh/cmds/modules/mount/mount_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/mount_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"mount",
-	"The mount command",
-	&cmd_mount,
-	&help_cmd_mount,
-},
-
Index: uspace/app/bdsh/cmds/modules/mount/mount_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/mount_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/mount/mount_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"mount",
+	"The mount command",
+	&cmd_mount,
+	&help_cmd_mount,
+},
+
Index: uspace/app/bdsh/cmds/modules/mv/mv_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/mv/mv_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,14 +1,0 @@
-{
-	"mv",
-	"The mv command",
-	&cmd_mv,
-	&help_cmd_mv,
-},
-
-{
-	"ren",
-	NULL,
-	&cmd_mv,
-	&help_cmd_mv,
-},
-
Index: uspace/app/bdsh/cmds/modules/mv/mv_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/mv/mv_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/mv/mv_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,14 @@
+{
+	"mv",
+	"The mv command",
+	&cmd_mv,
+	&help_cmd_mv,
+},
+
+{
+	"ren",
+	NULL,
+	&cmd_mv,
+	&help_cmd_mv,
+},
+
Index: uspace/app/bdsh/cmds/modules/printf/printf_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/printf/printf_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"printf",
-	"Format and print data",
-	&cmd_printf,
-	&help_cmd_printf,
-},
-
Index: uspace/app/bdsh/cmds/modules/printf/printf_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/printf/printf_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/printf/printf_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"printf",
+	"Format and print data",
+	&cmd_printf,
+	&help_cmd_printf,
+},
+
Index: uspace/app/bdsh/cmds/modules/pwd/pwd_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/pwd/pwd_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,6 +1,0 @@
-{
-	"pwd",
-	"Prints the current working directory",
-	&cmd_pwd,
-	&help_cmd_pwd,
-},
Index: uspace/app/bdsh/cmds/modules/pwd/pwd_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/pwd/pwd_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/pwd/pwd_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,6 @@
+{
+	"pwd",
+	"Prints the current working directory",
+	&cmd_pwd,
+	&help_cmd_pwd,
+},
Index: uspace/app/bdsh/cmds/modules/rm/rm_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"rm",
-	"Remove files and directories",
-	&cmd_rm,
-	&help_cmd_rm,
-},
-
Index: uspace/app/bdsh/cmds/modules/rm/rm_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/rm/rm_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"rm",
+	"Remove files and directories",
+	&cmd_rm,
+	&help_cmd_rm,
+},
+
Index: uspace/app/bdsh/cmds/modules/sleep/sleep_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,7 +1,0 @@
-{
-	"sleep",
-	"Pause for given time interval (in seconds)",
-	&cmd_sleep,
-	&help_cmd_sleep,
-},
-
Index: uspace/app/bdsh/cmds/modules/sleep/sleep_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,7 @@
+{
+	"sleep",
+	"Pause for given time interval (in seconds)",
+	&cmd_sleep,
+	&help_cmd_sleep,
+},
+
Index: uspace/app/bdsh/cmds/modules/touch/touch_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,6 +1,0 @@
-{
-	"touch",
-	"Create files or update access times",
-	&cmd_touch,
-	&help_cmd_touch,
-},
Index: uspace/app/bdsh/cmds/modules/touch/touch_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/touch/touch_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,6 @@
+{
+	"touch",
+	"Create files or update access times",
+	&cmd_touch,
+	&help_cmd_touch,
+},
Index: uspace/app/bdsh/cmds/modules/unmount/unmount_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/unmount/unmount_def.h	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ 	(revision )
@@ -1,14 +1,0 @@
-{
-	"unmount",
-	"The unmount command",
-	&cmd_unmount,
-	&help_cmd_unmount,
-},
-
-{
-	"umount",
-	NULL,
-	&cmd_unmount,
-	&help_cmd_unmount,
-},
-
Index: uspace/app/bdsh/cmds/modules/unmount/unmount_def.inc
===================================================================
--- uspace/app/bdsh/cmds/modules/unmount/unmount_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
+++ uspace/app/bdsh/cmds/modules/unmount/unmount_def.inc	(revision 70327bb9f8beeef8e3cc1229413c660b112b143e)
@@ -0,0 +1,14 @@
+{
+	"unmount",
+	"The unmount command",
+	&cmd_unmount,
+	&help_cmd_unmount,
+},
+
+{
+	"umount",
+	NULL,
+	&cmd_unmount,
+	&help_cmd_unmount,
+},
+