diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile b/src/add-ons/kernel/file_systems/packagefs/Jamfile
index 47e4b2184c..e79647aace 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Jamfile
+++ b/src/add-ons/kernel/file_systems/packagefs/Jamfile
@@ -6,7 +6,7 @@ UsePrivateKernelHeaders ;
 UsePrivateHeaders package shared storage ;
 
 
-local subDirs = 
+local subDirs =
 	indices
 	nodes
 	package
@@ -106,7 +106,8 @@ HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1 =
 
 Includes
 	[ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
-		$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1) ]
+		$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1)
+		ZlibCompressionBase.cpp ZlibDecompressor.cpp ]
 	: [ BuildFeatureAttribute zlib : headers ] ;
 
 local libSharedSources =
diff --git a/src/system/boot/loader/file_systems/packagefs/Jamfile b/src/system/boot/loader/file_systems/packagefs/Jamfile
index 5a954a626f..3b9433b744 100644
--- a/src/system/boot/loader/file_systems/packagefs/Jamfile
+++ b/src/system/boot/loader/file_systems/packagefs/Jamfile
@@ -17,19 +17,11 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits shared ] ;
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits support ] ;
 
 
-BootStaticLibrary boot_packagefs :
-	packagefs.cpp
-	PackageSettingsItem.cpp
-
-	# package kit
-
-	# package kit/hpkg
+HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
 	BlockBufferPool.cpp
 	BlockBufferPoolImpl.cpp
-	BlockBufferPoolNoLock.cpp
 	BufferDataOutput.cpp
 	BufferPool.cpp
-	PoolBuffer.cpp
 	DataReader.cpp
 	ErrorOutput.cpp
 	FDDataReader.cpp
@@ -41,7 +33,15 @@ BootStaticLibrary boot_packagefs :
 	PackageFileHeapAccessorBase.cpp
 	PackageFileHeapReader.cpp
 	PackageReaderImpl.cpp
+	PoolBuffer.cpp
 	ReaderImplBase.cpp
+;
+
+BootStaticLibrary boot_packagefs :
+	packagefs.cpp
+	PackageSettingsItem.cpp
+
+	$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
 
 	# compression
 	DataIO.cpp
@@ -51,8 +51,6 @@ BootStaticLibrary boot_packagefs :
 	: -fno-pic
 ;
 
-Includes [
-	FGristFiles ZlibCompressionBase.cpp package/hpkg/ZlibCompressor.h
-		shared/ZlibDecompressor.h
-	]
+Includes [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
+		ZlibCompressionBase.cpp ZlibDecompressor.cpp ]
 	: [ BuildFeatureAttribute zlib : headers ] ;