diff --git a/src/tools/bfs_shell/Jamfile b/src/tools/bfs_shell/Jamfile
index 83fbf51cbd..069b776e40 100644
--- a/src/tools/bfs_shell/Jamfile
+++ b/src/tools/bfs_shell/Jamfile
@@ -2,6 +2,9 @@ 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 ;
+
 # set some additional defines
 {
 	local defines =
diff --git a/src/tools/fs_shell/Jamfile b/src/tools/fs_shell/Jamfile
index 0c9f386e2e..ba4b2568cf 100644
--- a/src/tools/fs_shell/Jamfile
+++ b/src/tools/fs_shell/Jamfile
@@ -14,9 +14,10 @@ if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 UsePrivateHeaders fs_shell ;
 UsePrivateHeaders shared ;
 
-local defines = [ FDefines FS_SHELL=1 ] ;
-SubDirCcFlags $(defines) ;
-SubDirC++Flags $(defines) ;
+DEFINES += FS_SHELL=1 ;
+
+# prevent inclusion of HaikuBuildCompatibility.h
+DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 
 # platform specific sources/libraries
 local fsShellCommandSources ;