diff --git a/src/add-ons/kernel/file_systems/packagefs/util/DebugSupport.h b/headers/private/file_systems/DebugSupport.h
similarity index 99%
rename from src/add-ons/kernel/file_systems/packagefs/util/DebugSupport.h
rename to headers/private/file_systems/DebugSupport.h
index c85816fc3e..8e7626e681 100644
--- a/src/add-ons/kernel/file_systems/packagefs/util/DebugSupport.h
+++ b/headers/private/file_systems/DebugSupport.h
@@ -32,7 +32,7 @@
 #	define DEBUG_PRINT 0
 #endif
 #ifndef DEBUG_APP
-#	define DEBUG_APP	"packagefs"
+#	define DEBUG_APP	"unknown"
 #endif
 #ifndef DEBUG_PRINT_FILE
 #	define DEBUG_PRINT_FILE "/var/log/" DEBUG_APP ".log"
diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile b/src/add-ons/kernel/file_systems/packagefs/Jamfile
index 5a31abff21..b6153ded35 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Jamfile
+++ b/src/add-ons/kernel/file_systems/packagefs/Jamfile
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel file_systems packagefs ;
 
 UseBuildFeatureHeaders zlib ;
 UsePrivateKernelHeaders ;
-UsePrivateHeaders package shared storage support ;
+UsePrivateHeaders package shared storage support file_systems ;
 
 local zstdSources ;
 local zstdKernelLib ;
@@ -37,7 +37,6 @@ HAIKU_PACKAGE_FS_SOURCES =
 	AutoPackageAttributes.cpp
 	BlockBufferPoolKernel.cpp
 	CachedDataReader.cpp
-	DebugSupport.cpp
 	Dependency.cpp
 	Directory.cpp
 	EmptyAttributeDirectoryCookie.cpp
@@ -82,6 +81,7 @@ HAIKU_PACKAGE_FS_SOURCES =
 
 HAIKU_PACKAGE_FS_SHARED_SOURCES =
 	QueryParserUtils.cpp
+	DebugSupport.cpp
 ;
 
 HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
diff --git a/src/add-ons/kernel/file_systems/packagefs/util/DebugSupport.cpp b/src/add-ons/kernel/file_systems/shared/DebugSupport.cpp
similarity index 100%
rename from src/add-ons/kernel/file_systems/packagefs/util/DebugSupport.cpp
rename to src/add-ons/kernel/file_systems/shared/DebugSupport.cpp