diff --git a/src/kits/opengl/Jamfile b/src/kits/opengl/Jamfile
index f3e763e504..0a0097b032 100644
--- a/src/kits/opengl/Jamfile
+++ b/src/kits/opengl/Jamfile
@@ -4,6 +4,12 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders opengl ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UseHeaders [ FDirName $(HAIKU_TOP) headers os opengl ] : true ;
+		# We need the public GL headers also when not compiling for Haiku.
+}
+
+
 UseHeaders [ FDirName $(SUBDIR) mesa ] ;
 UseHeaders [ FDirName $(SUBDIR) mesa main ] ;
 UseHeaders [ FDirName $(SUBDIR) mesa glapi ] ;
@@ -43,9 +49,11 @@ SharedLibrary libGL.so :
 	# GLUT API is included in libGL.so under Haiku, not a separate libglut.so library
 	<opengl>glut.o 
 
-	libbe.so 
-	libgame.so		# BWindowScreen needed by BGLScreen stub class 
 	libmesa.a		# For GL API dispatching, mostly 
+
+	# External libs:
+	be 
+	game			# BWindowScreen needed by BGLScreen stub class 
 ;
 
 Package haiku-opengl-cvs :
diff --git a/src/kits/opengl/glu/Jamfile b/src/kits/opengl/glu/Jamfile
index b930e2045b..aff2551ca2 100644
--- a/src/kits/opengl/glu/Jamfile
+++ b/src/kits/opengl/glu/Jamfile
@@ -1,5 +1,12 @@
 SubDir HAIKU_TOP src kits opengl glu ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
+if $(TARGET_PLATFORM) != haiku {
+	UseHeaders [ FDirName $(HAIKU_TOP) headers os opengl ] : true ;
+		# We need the public GL headers also when not compiling for Haiku.
+}
+
 UseHeaders [ FDirName $(SUBDIR) include ] ;
 UseHeaders [ FDirName $(SUBDIR) libnurbs interface  ] ;
 UseHeaders [ FDirName $(SUBDIR) libnurbs internals ] ;
diff --git a/src/kits/opengl/mesa/Jamfile b/src/kits/opengl/mesa/Jamfile
index 388644a2a9..4a4fefe4e1 100644
--- a/src/kits/opengl/mesa/Jamfile
+++ b/src/kits/opengl/mesa/Jamfile
@@ -1,5 +1,12 @@
 SubDir HAIKU_TOP src kits opengl mesa ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
+if $(TARGET_PLATFORM) != haiku {
+	UseHeaders [ FDirName $(HAIKU_TOP) headers os opengl ] : true ;
+		# We need the public GL headers also when not compiling for Haiku.
+}
+
 UsePrivateHeaders opengl ;
 
 UseHeaders [ FDirName $(SUBDIR) main ] ;