diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index df8fb66dbd..191a5f007d 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -741,7 +741,8 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) && $(TARGET_PLATFORM_BEOS_COMPATIBLE) {
 if $(TARGET_PLATFORM) = libbe_test {
 	# headers and flags
 	TARGET_HDRS +=
-		[ PublicHeaders app drivers game interface kernel storage support ]
+		[ PublicHeaders $(DOT) app drivers game interface kernel storage
+			support ]
 		[ PrivateHeaders $(DOT) ] ;
 	TARGET_DEFINES += __HAIKU__ ;
 
diff --git a/src/build/libhaikucompat/Jamfile b/src/build/libhaikucompat/Jamfile
index 5edcf7e50e..c38c206358 100644
--- a/src/build/libhaikucompat/Jamfile
+++ b/src/build/libhaikucompat/Jamfile
@@ -2,6 +2,7 @@ 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 ;
 
 local libbeTestSources ;
diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index af82aacf41..a18f9e8153 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -7,6 +7,7 @@ if $(TARGET_PLATFORM) = libbe_test {
 
 UseLibraryHeaders agg png zlib ;
 UsePrivateHeaders app graphics input interface shared storage ;
+UsePrivateHeaders [ FDirName graphics common ] ;
 
 # headers/build/private/kernel is needed for safemode.h and syscalls.h.
 # headers/private/kernel for the util/* stuff.