diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
index a1416f3085..f5836bef77 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
@@ -54,7 +54,7 @@ SYSHDRS = $(HAIKU_HDRS) ;
 			fstat=build_platform_fstat
 			read_pos=build_platform_read_pos
 			ioctl=build_platform_ioctl
-			"send_notification\\(...\\)="
+			MEAN_BFS_SHELL_SELECT_HACK=1
 		;
 	}
 
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp b/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp
index 06b9a29a04..89a0de0ad1 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp
+++ b/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp
@@ -9,6 +9,8 @@
  */
 
 
+#include "fsproto.h"	// include first for hacky reasons
+
 #include "Query.h"
 #include "bfs.h"
 #include "Debug.h"
@@ -18,8 +20,6 @@
 #include "BPlusTree.h"
 #include "Index.h"
 
-#include "fsproto.h"
-
 #include <util/kernel_cpp.h>
 #include <SupportDefs.h>
 #include <NodeMonitor.h>
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h b/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h
index 26ee10d1b4..091b9c56c6 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h
+++ b/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h
@@ -6,6 +6,16 @@
 #ifndef _FSPROTO_H
 #define _FSPROTO_H
 
+// TODO: FIXME! XXX! DANGER! BIOHAZARD!
+// OMG, we're defining COMPILE_FOR_R5 so that <drivers/Select.h> defines the
+// obsolete notify_select_event() prototype. BTW, this happens only on
+// non-BeOS-compatible host platforms. Outright scary!
+#ifdef MEAN_BFS_SHELL_SELECT_HACK
+#	define COMPILE_FOR_R5
+#	include <drivers/Select.h>
+#	undef COMPILE_FOR_R5
+#endif
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>