diff --git a/src/build/libbe/app/Jamfile b/src/build/libbe/app/Jamfile
index da206b1650..a36852d7c3 100644
--- a/src/build/libbe/app/Jamfile
+++ b/src/build/libbe/app/Jamfile
@@ -1,7 +1,6 @@
 SubDir HAIKU_TOP src build libbe app ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private app ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ;
+UsePrivateBuildHeaders app shared ;
 
 USES_BE_API on <libbe_build>app_kit.o = true ;
 
diff --git a/src/build/libbe/interface/Jamfile b/src/build/libbe/interface/Jamfile
index 4151349619..70d8a91e54 100644
--- a/src/build/libbe/interface/Jamfile
+++ b/src/build/libbe/interface/Jamfile
@@ -1,8 +1,6 @@
 SubDir HAIKU_TOP src build libbe interface ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private app ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private interface ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ;
+UsePrivateBuildHeaders app interface shared ;
 
 USES_BE_API on <libbe_build>interface_kit.o = true ;
 
diff --git a/src/build/libbe/storage/Jamfile b/src/build/libbe/storage/Jamfile
index 3d1c51846c..46f29833dc 100644
--- a/src/build/libbe/storage/Jamfile
+++ b/src/build/libbe/storage/Jamfile
@@ -1,9 +1,6 @@
 SubDir HAIKU_TOP src build libbe storage ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private app ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private kernel ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private storage ] : true ;
+UsePrivateBuildHeaders app kernel shared storage ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) mime ] ;
 
diff --git a/src/build/libbe/support/Jamfile b/src/build/libbe/support/Jamfile
index 2e2004487b..a007875157 100644
--- a/src/build/libbe/support/Jamfile
+++ b/src/build/libbe/support/Jamfile
@@ -1,8 +1,6 @@
 SubDir HAIKU_TOP src build libbe support ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private app ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private interface ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ;
+UsePrivateBuildHeaders app interface shared ;
 
 USES_BE_API on <libbe_build>support_kit.o = true ;
 
diff --git a/src/build/libhaikucompat/Jamfile b/src/build/libhaikucompat/Jamfile
index 7631c2401f..2003b8dc52 100644
--- a/src/build/libhaikucompat/Jamfile
+++ b/src/build/libhaikucompat/Jamfile
@@ -2,11 +2,8 @@ SubDir HAIKU_TOP src build libhaikucompat ;
 
 SetSubDirSupportedPlatforms libbe_test r5 dano bone ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private kernel ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private system arch
-		$(HOST_ARCH) ] : true ;
-	# for <asm_defs.h>
+UsePrivateBuildHeaders . kernel [ FDirName system arch $(HOST_ARCH) ] ;
+	# the latter for <asm_defs.h>
 
 
 local libbeTestSources ;
diff --git a/src/build/libroot/Jamfile b/src/build/libroot/Jamfile
index ae9109c872..a2a54577ae 100644
--- a/src/build/libroot/Jamfile
+++ b/src/build/libroot/Jamfile
@@ -8,7 +8,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers build os interface ] : true ;
 UseHeaders [ FDirName $(HAIKU_TOP) headers build os storage ] : true ;
 UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private kernel ] : true ;
+UsePrivateBuildHeaders kernel ;
 
 {
 	local defines = [ FDefines
diff --git a/src/build/libshared/Jamfile b/src/build/libshared/Jamfile
index bbfab89366..ddae281a31 100644
--- a/src/build/libshared/Jamfile
+++ b/src/build/libshared/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src build libshared ;
 
 USES_BE_API on libshared_build.a = true ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ;
+UsePrivateBuildHeaders shared ;
 
 BuildPlatformStaticLibrary libshared_build.a :
 	Keymap.cpp
diff --git a/src/tools/Jamfile b/src/tools/Jamfile
index fd68d788ab..e796bea33f 100644
--- a/src/tools/Jamfile
+++ b/src/tools/Jamfile
@@ -1,7 +1,6 @@
 SubDir HAIKU_TOP src tools ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private app ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private storage ] : true ;
+UsePrivateBuildHeaders app storage ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src/bin ] ;
 
diff --git a/src/tools/keymap/Jamfile b/src/tools/keymap/Jamfile
index a913884f5c..c248751e93 100644
--- a/src/tools/keymap/Jamfile
+++ b/src/tools/keymap/Jamfile
@@ -1,7 +1,6 @@
 SubDir HAIKU_TOP src tools keymap ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) headers build private storage ] : true ;
+UsePrivateBuildHeaders shared storage ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin keymap ] ;