--- /usr/portage/media-libs/mesa/mesa-8.0.1-r2.ebuild	2012-02-24 18:01:18.000000000 +0000
+++ /usr/portage/media-libs/mesa/mesa-8.0.1-r3.ebuild	2012-03-24 22:40:44.000000000 +0000
@@ -285,6 +287,9 @@
 					|| die "Failed to move ${x}"
 			fi
 		done
+		mv "${ED}"/usr/include/{EGL,GLES*,VG,KHR}/ \
+			"${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
+			|| die "Failed to move headers"
 	eend $?
 
 	if use classic || use gallium; then