diff --git a/x11-proto/glproto/glproto-9999.ebuild b/x11-proto/glproto/glproto-9999.ebuild
index c273dc5..d5f6192 100644
--- a/x11-proto/glproto/glproto-9999.ebuild
+++ b/x11-proto/glproto/glproto-9999.ebuild
@@ -33,9 +33,12 @@ dynamic_libgl_install() {
 		# glext.h added for #54984
 		for x in "${D}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
 			if [[ -f ${x} || -L ${x} ]]; then
-				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include || die
 			fi
 		done
+
+		# needed to use the headers directly, i.e. when compiling xorg-server
+		dosym . /usr/$(get_libdir)/opengl/${OPENGL_DIR}/include/GL || die
 	eend 0
 }