diff --git a/headers/private/file_systems/DeviceOpener.h b/headers/private/file_systems/DeviceOpener.h
index 6f71aa8131..acf8510add 100644
--- a/headers/private/file_systems/DeviceOpener.h
+++ b/headers/private/file_systems/DeviceOpener.h
@@ -6,7 +6,14 @@
 #ifndef DEVICEOPENER_H
 #define DEVICEOPENER_H
 
-#include "system_dependencies.h"
+#ifdef FS_SHELL
+#	include "fssh_api_wrapper.h"
+#else
+#	include <fcntl.h>
+#	include <sys/types.h>
+#	include <SupportDefs.h>
+#endif
+
 
 class DeviceOpener {
 	public:
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 070b086ca7..115e940e31 100644
--- a/src/add-ons/kernel/file_systems/bfs/system_dependencies.h
+++ b/src/add-ons/kernel/file_systems/bfs/system_dependencies.h
@@ -8,8 +8,6 @@
 
 #ifdef FS_SHELL
 
-#include <new>
-
 #include "fssh_api_wrapper.h"
 #include "fssh_auto_deleter.h"
 
diff --git a/src/add-ons/kernel/file_systems/shared/DeviceOpener.cpp b/src/add-ons/kernel/file_systems/shared/DeviceOpener.cpp
index 60833fff0d..1a97fb8edd 100644
--- a/src/add-ons/kernel/file_systems/shared/DeviceOpener.cpp
+++ b/src/add-ons/kernel/file_systems/shared/DeviceOpener.cpp
@@ -4,9 +4,14 @@
  */
 
 
-#include "system_dependencies.h"
 #include "file_systems/DeviceOpener.h"
 
+#ifndef FS_SHELL
+#	include <errno.h>
+#	include <Drivers.h>
+#	include <fs_cache.h>
+#endif
+
 
 DeviceOpener::DeviceOpener(const char* device, int mode)
 	:
diff --git a/src/add-ons/kernel/file_systems/shared/system_dependencies.h b/src/add-ons/kernel/file_systems/shared/system_dependencies.h
deleted file mode 100644
index a26c748c3f..0000000000
--- a/src/add-ons/kernel/file_systems/shared/system_dependencies.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _SYSTEM_DEPENDENCIES_H
-#define _SYSTEM_DEPENDENCIES_H
-
-#ifdef FS_SHELL
-// This needs to be included before the fs_shell wrapper
-
-#include "fssh_api_wrapper.h"
-#include "fssh_auto_deleter.h"
-//#include <new>
-
-#else // !FS_SHELL
-
-#include <AutoDeleter.h>
-#include <util/AutoLock.h>
-#include <util/DoublyLinkedList.h>
-#include <util/SinglyLinkedList.h>
-#include <util/Stack.h>
-
-#include <ByteOrder.h>
-
-#include <tracing.h>
-#include <driver_settings.h>
-#include <fs_attr.h>
-#include <fs_cache.h>
-#include <fs_index.h>
-#include <fs_info.h>
-#include <fs_interface.h>
-#include <fs_query.h>
-#include <fs_volume.h>
-#include <Drivers.h>
-#include <errno.h>
-#include <KernelExport.h>
-#include <NodeMonitor.h>
-#include <SupportDefs.h>
-#include <TypeConstants.h>
-#endif // !FS_SHELL
-
-#endif // _SYSTEM_DEPENDENCIES
diff --git a/src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/Jamfile
index f4fd284d21..8993fc39d8 100644
--- a/src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/Jamfile
@@ -2,8 +2,8 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems btrfs btrfs_shell ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems btrfs ] ;
 
-# prevent inclusion of HaikuBuildCompatibility.h
-DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
+# prevent inclusion of HaikuBuildCompatibility.h and _BSD_SOURCE headers
+DEFINES += HAIKU_BUILD_COMPATIBILITY_H __STRICT_ANSI__ ;
 
 # set some additional defines
 {
diff --git a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
index 16ed05e809..4b95ac9e33 100644
--- a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
@@ -3,8 +3,8 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems iso9660 iso9660_shell ;
 SEARCH_SOURCE
 	+= [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems iso9660 ] ;
 
-# prevent inclusion of HaikuBuildCompatibility.h
-DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
+# prevent inclusion of HaikuBuildCompatibility.h and _BSD_SOURCE headers
+DEFINES += HAIKU_BUILD_COMPATIBILITY_H __STRICT_ANSI__ ;
 
 # set some additional defines
 {
diff --git a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
index 53edbd46f8..df9ec457e1 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
@@ -2,8 +2,8 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems udf udf_shell ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems udf ] ;
 
-# prevent inclusion of HaikuBuildCompatibility.h
-DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
+# prevent inclusion of HaikuBuildCompatibility.h and _BSD_SOURCE headers
+DEFINES += HAIKU_BUILD_COMPATIBILITY_H __STRICT_ANSI__ ;
 
 # set some additional defines
 {
diff --git a/src/tests/add-ons/kernel/file_systems/ufs2/ufs2_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/ufs2/ufs2_shell/Jamfile
index 87ed9f0061..107f755384 100644
--- a/src/tests/add-ons/kernel/file_systems/ufs2/ufs2_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/ufs2/ufs2_shell/Jamfile
@@ -2,8 +2,8 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems ufs2 ufs2_shell ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems ufs2 ] ;
 
-# prevent inclusion of HaikuBuildCompatibility.h
-DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
+# prevent inclusion of HaikuBuildCompatibility.h and _BSD_SOURCE headers
+DEFINES += HAIKU_BUILD_COMPATIBILITY_H __STRICT_ANSI__ ;
 
 # set some additional defines
 {
diff --git a/src/tests/add-ons/kernel/file_systems/xfs/xfs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/xfs/xfs_shell/Jamfile
index f4aade70ac..41caf14c65 100644
--- a/src/tests/add-ons/kernel/file_systems/xfs/xfs_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/xfs/xfs_shell/Jamfile
@@ -2,8 +2,8 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems xfs xfs_shell ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems xfs ] ;
 
-# prevent inclusion of HaikuBuildCompatibility.h
-DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
+# prevent inclusion of HaikuBuildCompatibility.h and _BSD_SOURCE headers
+DEFINES += HAIKU_BUILD_COMPATIBILITY_H __STRICT_ANSI__ ;
 
 # set some additional defines
 {
@@ -68,4 +68,4 @@ SEARCH on [ FGristFiles QueryParserUtils.cpp ]
 	+= [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems shared ] ;
 
 SEARCH on [ FGristFiles DeviceOpener.cpp ]
-	+= [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems shared ] ;
\ No newline at end of file
+	+= [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems shared ] ;
diff --git a/src/tools/bfs_shell/Jamfile b/src/tools/bfs_shell/Jamfile
index dd9b493361..80f4175323 100644
--- a/src/tools/bfs_shell/Jamfile
+++ b/src/tools/bfs_shell/Jamfile
@@ -2,8 +2,8 @@ SubDir HAIKU_TOP src tools bfs_shell ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems bfs ] ;
 
-# prevent inclusion of HaikuBuildCompatibility.h
-DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
+# prevent inclusion of HaikuBuildCompatibility.h and BSD headers
+DEFINES += HAIKU_BUILD_COMPATIBILITY_H __STRICT_ANSI__ ;
 
 # set some additional defines
 {
diff --git a/src/tools/fs_shell/Jamfile b/src/tools/fs_shell/Jamfile
index 9f72f467e5..a01dee9a3e 100644
--- a/src/tools/fs_shell/Jamfile
+++ b/src/tools/fs_shell/Jamfile
@@ -14,8 +14,8 @@ UsePrivateHeaders shared ;
 
 DEFINES += FS_SHELL=1 ;
 
-# prevent inclusion of HaikuBuildCompatibility.h
-DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
+# prevent inclusion of HaikuBuildCompatibility.h and _BSD_SOURCE headers
+DEFINES += HAIKU_BUILD_COMPATIBILITY_H __STRICT_ANSI__ ;
 
 # platform specific sources/libraries
 local fsShellCommandSources ;