diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c
index 97439e40b0..56d2bff731 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c
+++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c
@@ -1,21 +1,17 @@
-/* This file is included in fs_shell:fsh.c
- * Insert your implementation of additional commands in here
- *
- * Format:
- *
- * static int
- * function(int argc, char **argv)
- * {
- * }
- *
- */
-
 
 #define _FS_INTERFACE_H
 	// don't include that file
 
+#include <stdio.h>
+#include <StorageDefs.h>
+
+#include "compat.h"
+#include "fsproto.h"
+#include "kprotos.h"
 #include "bfs_control.h"
 
+#include "additional_commands.h"
+
 
 static int
 do_chkbfs(int argc, char **argv)
@@ -95,3 +91,7 @@ do_chkbfs(int argc, char **argv)
 	return 0;
 }
 
+cmd_entry additional_commands[] = {
+	{ "chkbfs",	 do_chkbfs, "does a chkbfs on the volume" },
+    { NULL, NULL }
+};
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.h b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.h
deleted file mode 100644
index 088dcd1d4b..0000000000
--- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* This file is included in fs_shell:fsh.c
- * Insert your definition of additional commands here
- *
- * Format:
- *	{ commandName, functionName, commandDescription },
- *
- * And don't forget the comma after the line :-)
- */
-
-    { "chkbfs",	 do_chkbfs, "does a chkbfs on the volume" },
-
-/* You can also define your own prompt so that your fs shell
- * can be differentiated from others easily:
- */
-
-#define FS_SHELL_PROMPT "bfs_shell"
-