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