diff --git a/src/tests/kits/opengl/demos/gears/Jamfile b/src/tests/kits/opengl/demos/gears/Jamfile
index e195a65d2b..9cc394ceef 100644
--- a/src/tests/kits/opengl/demos/gears/Jamfile
+++ b/src/tests/kits/opengl/demos/gears/Jamfile
@@ -1,4 +1,5 @@
 SubDir HAIKU_TOP src tests kits opengl demos gears ;
+SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
@@ -9,7 +10,15 @@ if $(TARGET_PLATFORM) != haiku {
 	UsePublicHeaders opengl ;
 }
 
-SimpleTest GLGears :
+
+local sources =
 	gears.c
+;
+
+Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
+
+
+SimpleTest GLGears :
+	$(sources)
 	: be GL
 ;
diff --git a/src/tests/kits/opengl/direct_mode/Jamfile b/src/tests/kits/opengl/direct_mode/Jamfile
index 8303c3ad7a..de41e03a9f 100644
--- a/src/tests/kits/opengl/direct_mode/Jamfile
+++ b/src/tests/kits/opengl/direct_mode/Jamfile
@@ -10,8 +10,14 @@ if $(TARGET_PLATFORM) != haiku {
 	UsePublicHeaders opengl ;
 }
 
-SimpleTest GLDirectMode :
+local sources =
 	GLDirectMode.cpp
+;
+
+Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
+
+SimpleTest GLDirectMode :
+	$(sources)
 	: be game GL $(TARGET_LIBSUPC++)
 	: GLDirectMode.rdef
 ;
diff --git a/src/tests/kits/opengl/glsl/Jamfile b/src/tests/kits/opengl/glsl/Jamfile
index f41ec048fb..4a17e83c29 100644
--- a/src/tests/kits/opengl/glsl/Jamfile
+++ b/src/tests/kits/opengl/glsl/Jamfile
@@ -1,4 +1,5 @@
 SubDir HAIKU_TOP src tests kits opengl glsl ;
+SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
@@ -9,10 +10,16 @@ if $(TARGET_PLATFORM) != haiku {
 	UsePublicHeaders opengl ;
 }
 
-StaticLibrary libshaderutil.a :
+local shadersources =
 	shaderutil.c
 ;
 
+Includes [ FGristFiles $(shadersources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
+
+StaticLibrary libshaderutil.a :
+	$(shadersources)
+;
+
 SimpleTest brick :
 	brick.c
 	: libshaderutil.a be GL
diff --git a/src/tests/kits/opengl/glut/game_mode/Jamfile b/src/tests/kits/opengl/glut/game_mode/Jamfile
index 694606ebcb..c01235fdad 100644
--- a/src/tests/kits/opengl/glut/game_mode/Jamfile
+++ b/src/tests/kits/opengl/glut/game_mode/Jamfile
@@ -1,4 +1,5 @@
 SubDir HAIKU_TOP src tests kits opengl glut game_mode ;
+SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
@@ -9,7 +10,13 @@ if $(TARGET_PLATFORM) != haiku {
 	UsePublicHeaders opengl ;
 }
 
-SimpleTest GLUTGameMode :
+local sources =
 	game_mode.c
+;
+
+Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
+
+SimpleTest GLUTGameMode :
+	$(sources)
 	: be GL
 ;