diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
index ee6d0afd8b..929d037be0 100644
--- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
@@ -15,9 +15,6 @@
 #include "Attribute.h"
 #include "bfs_control.h"
 
-#ifndef BFS_SHELL
-#	include <driver_settings.h>
-#endif
 
 #define BFS_IO_SIZE	65536
 
@@ -2051,8 +2048,6 @@ bfs_initialize(const char *partition, const char *name, const char *parameters,
 	uint32 flags = 0;
 	bool verbose = false;
 
-// TODO: driver_settings are not yet supported by the fsshell
-#ifndef BFS_SHELL
 	void *handle = parse_driver_settings_string(parameters);
 	if (handle != NULL) {
 		if (get_driver_boolean_parameter(handle, "noindex", false, true))
@@ -2073,7 +2068,6 @@ bfs_initialize(const char *partition, const char *name, const char *parameters,
 		INFORM(("valid block sizes are: 1024, 2048, 4096, and 8192\n"));
 		return B_BAD_VALUE;
 	}
-#endif
 
 	Volume volume(-1);
 	status_t status = volume.Initialize(partition, name, blockSize, flags);
diff --git a/src/add-ons/kernel/file_systems/bfs/system_dependencies.h b/src/add-ons/kernel/file_systems/bfs/system_dependencies.h
index 92c1492090..393993dc39 100644
--- a/src/add-ons/kernel/file_systems/bfs/system_dependencies.h
+++ b/src/add-ons/kernel/file_systems/bfs/system_dependencies.h
@@ -25,6 +25,7 @@
 #include <ByteOrder.h>
 
 #ifndef _BOOT_MODE
+#include <driver_settings.h>
 #include <fs_attr.h>
 #include <fs_cache.h>
 #include <fs_index.h>