diff --git a/src/tools/addattr/Jamfile b/src/tools/addattr/Jamfile
index 24e307b6fc..fb64f1545c 100644
--- a/src/tools/addattr/Jamfile
+++ b/src/tools/addattr/Jamfile
@@ -6,5 +6,5 @@ USES_BE_API on <build>addattr = true ;
 
 BuildPlatformMain <build>addattr
 	: main.cpp addAttr.cpp
-	: $(HOST_LIBBE) $(HOST_LIBSUPC++)
+	: $(HOST_LIBBE) $(HOST_LIBSTDC++) $(HOST_LIBSUPC++)
 ;
diff --git a/src/tools/fs_shell/Jamfile b/src/tools/fs_shell/Jamfile
index 13ce3862bf..c51693b350 100644
--- a/src/tools/fs_shell/Jamfile
+++ b/src/tools/fs_shell/Jamfile
@@ -60,4 +60,4 @@ BuildPlatformStaticLibrary <build>fs_shell.a :
 
 BuildPlatformMain <build>fs_shell_command
 	: fs_shell_command.cpp $(fsShellCommandSources)
-	: $(HOST_LIBSUPC++) ;
+	: $(HOST_LIBSTDC++) $(HOST_LIBSUPC++) ;
diff --git a/src/tools/fs_shell/unistd.cpp b/src/tools/fs_shell/unistd.cpp
index bf95e8a34c..2569fc6e46 100644
--- a/src/tools/fs_shell/unistd.cpp
+++ b/src/tools/fs_shell/unistd.cpp
@@ -19,7 +19,8 @@
 #ifdef __BEOS__
 #	include <Drivers.h>
 #else
-#	if defined(HAIKU_HOST_PLATFORM_FREEBSD)
+#	if defined(HAIKU_HOST_PLATFORM_FREEBSD) \
+		|| defined(HAIKU_HOST_PLATFORM_DARWIN)
 #		include <sys/ioctl.h>
 #	else
 		// the (POSIX) correct place of definition for ioctl()