diff --git a/src/libs/zlib/Jamfile b/src/libs/zlib/Jamfile
index 6311cde5ba..6455a4b970 100644
--- a/src/libs/zlib/Jamfile
+++ b/src/libs/zlib/Jamfile
@@ -1,5 +1,7 @@
 SubDir HAIKU_TOP src libs zlib ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
 UseLibraryHeaders zlib ;
 
 local shared_files =
diff --git a/src/system/boot/loader/load_driver_settings.cpp b/src/system/boot/loader/load_driver_settings.cpp
index 12f7f5453d..3595eea5a9 100644
--- a/src/system/boot/loader/load_driver_settings.cpp
+++ b/src/system/boot/loader/load_driver_settings.cpp
@@ -15,6 +15,7 @@
 #include <boot/platform.h>
 
 #include <string.h>
+#include <unistd.h>
 
 
 static status_t
diff --git a/src/tests/system/boot/loader/Jamfile b/src/tests/system/boot/loader/Jamfile
index 82e64db300..ca4fda40b2 100644
--- a/src/tests/system/boot/loader/Jamfile
+++ b/src/tests/system/boot/loader/Jamfile
@@ -1,5 +1,7 @@
 SubDir HAIKU_TOP src tests system boot loader ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName storage ] ;
@@ -12,6 +14,11 @@ SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems apple ;
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems efi ;
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders drivers ;	# disk_device_manager.h
+	UsePublicHeaders storage ;	# DiskDeviceDefs.h
+}
+
 # we need to redefine certain calls in the boot loader so that
 # they will really be used instead of their POSIX counterparts
 # in libroot.so
diff --git a/src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile b/src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile
index 0b786a67ff..84fc846197 100644
--- a/src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile
+++ b/src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile
@@ -1,11 +1,18 @@
 SubDir HAIKU_TOP src tests system boot loader file_systems amiga_ffs ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName storage ] ;
 SubDirSysHdrs $(HAIKU_TOP) src tests system boot loader ;
 SubDirHdrs $(HAIKU_TOP) src system boot loader file_systems amiga_ffs ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders drivers ;	# disk_device_manager.h
+	UsePublicHeaders storage ;	# DiskDeviceDefs.h
+}
+
 ObjectDefines 
 	amiga_ffs.cpp
 	Volume.cpp
diff --git a/src/tests/system/boot/loader/file_systems/bfs/Jamfile b/src/tests/system/boot/loader/file_systems/bfs/Jamfile
index f2a7019caf..1ed8911c4a 100644
--- a/src/tests/system/boot/loader/file_systems/bfs/Jamfile
+++ b/src/tests/system/boot/loader/file_systems/bfs/Jamfile
@@ -1,5 +1,7 @@
 SubDir HAIKU_TOP src tests system boot loader file_systems bfs ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName storage ] ;
@@ -7,6 +9,11 @@ SubDirSysHdrs $(HAIKU_TOP) src tests system boot loader ;
 SubDirHdrs $(HAIKU_TOP) src system boot loader file_systems bfs ;
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders drivers ;	# disk_device_manager.h
+	UsePublicHeaders storage ;	# DiskDeviceDefs.h
+}
+
 ObjectDefines
 	bfs.cpp
 	Directory.cpp
diff --git a/src/tests/system/boot/loader/file_systems/tarfs/Jamfile b/src/tests/system/boot/loader/file_systems/tarfs/Jamfile
index e83bfd11d1..874d75b5bc 100644
--- a/src/tests/system/boot/loader/file_systems/tarfs/Jamfile
+++ b/src/tests/system/boot/loader/file_systems/tarfs/Jamfile
@@ -1,11 +1,20 @@
 SubDir HAIKU_TOP src tests system boot loader file_systems tarfs ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders kernel shared storage ;
 SubDirSysHdrs $(HAIKU_TOP) src tests system boot loader ;
 SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
 SubDirHdrs $(HAIKU_TOP) src system boot loader file_systems tarfs ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders drivers ;	# disk_device_manager.h
+	UsePublicHeaders storage ;	# DiskDeviceDefs.h
+
+	ObjectDefines tarfs.cpp : B_BUFFER_OVERFLOW=B_BAD_VALUE ;
+}
+
 ObjectDefines 
 	tarfs.cpp
 	: