diff --git a/src/add-ons/kernel/file_systems/btrfs/Jamfile b/src/add-ons/kernel/file_systems/btrfs/Jamfile
index dee198ec74..dc246b44f9 100644
--- a/src/add-ons/kernel/file_systems/btrfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/btrfs/Jamfile
@@ -5,6 +5,9 @@ UsePrivateHeaders shared storage ;
 UsePrivateKernelHeaders ;
 UseBuildFeatureHeaders zlib ;
 
+Includes [ FGristFiles Inode.cpp ]
+	: [ BuildFeatureAttribute zlib : headers ] ;
+
 KernelAddon btrfs :
 	kernel_interface.cpp
 	Attribute.cpp
diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile b/src/add-ons/kernel/file_systems/packagefs/Jamfile
index 2fc47ee19c..70c5732666 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Jamfile
+++ b/src/add-ons/kernel/file_systems/packagefs/Jamfile
@@ -75,6 +75,8 @@ HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
 	ZlibDecompressor.cpp
 ;
 
+Includes [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES) ]
+	: [ BuildFeatureAttribute zlib : headers ] ;
 
 local libSharedSources =
 	NaturalCompare.cpp
diff --git a/src/system/boot/loader/file_systems/packagefs/Jamfile b/src/system/boot/loader/file_systems/packagefs/Jamfile
index e75ce5d78e..bae8160de3 100644
--- a/src/system/boot/loader/file_systems/packagefs/Jamfile
+++ b/src/system/boot/loader/file_systems/packagefs/Jamfile
@@ -44,3 +44,10 @@ BootStaticLibrary boot_packagefs :
 
 	: -fno-pic
 ;
+
+Includes [ 
+		FGristFiles PackageDataReader.cpp PackageDataReaderImpl.cpp 
+		ReaderImplBase.cpp ZlibCompressionBase.cpp ZlibDecompressor.cpp 
+	] 
+	: [ BuildFeatureAttribute zlib : headers ] ;
+
diff --git a/src/system/boot/platform/generic/Jamfile b/src/system/boot/platform/generic/Jamfile
index 7cdf24aee1..0ffd7b2cb5 100644
--- a/src/system/boot/platform/generic/Jamfile
+++ b/src/system/boot/platform/generic/Jamfile
@@ -11,3 +11,6 @@ BootStaticLibrary boot_platform_generic :
 	video_splash.cpp
 	: -fno-pic
 ;
+
+Includes [ FGristFiles video_splash.cpp ] 
+	: [ BuildFeatureAttribute zlib : headers ] ;