--- a/x11-base/xorg-server/xorg-server-9999.ebuild	
+++ a/x11-base/xorg-server/xorg-server-9999.ebuild	
@@ -161,24 +161,10 @@ pkg_setup() {
 			has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
 		INFO="yes"
 	fi
-}
-
-src_configure() {
-	# this is required only for configure and build time
-	# we need to ensure having enough glxtokens
-	# the subshell is needed so the addwrite is not shared in rest of that phase
-	OLD_IMPLEM="$(eselect opengl show)"
-	[[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OPENGL_DIR}; )
-	xorg-2_src_configure
-}
 
-src_compile() {
-	emake # no die here intentional
-	if [[ $? != 0 ]]; then
-		[[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OLD_IMPLEM}; )
-		die "Compilation failed"
-	fi
-	[[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && ( addwrite "${ROOT}"; eselect opengl set ${OLD_IMPLEM}; )
+	# Export Gentoo-specific OpenGL include location to avoid switching opengl
+	# profiles.
+	export C_INCLUDE_PATH=/usr/$(get_libdir)/opengl/xorg-x11/include
 }
 
 src_install() {