--- emul-linux-x86.eclass
+++ emul-linux-x86.eclass
@@ -8,7 +8,7 @@
 # Purpose: Providing a template for the app-emulation/emul-linux-* packages
 #
 
-inherit multilib
+inherit eutils multilib
 
 case "${EAPI:-0}" in
 	3|4|5)
@@ -86,6 +86,8 @@
 	# Move headers to a separate directory, bug #509556
 	if [[ -d "${D}"/usr/include ]] ; then
 		mkdir -p "${D}"/usr/include/i686-pc-linux-gnu/
-		mv "${D}"/usr/include/* "${D}"/usr/include/i686-pc-linux-gnu/.
+		eshopts_push -s extglob
+		eval 'mv "${D}"/usr/include/!(i686-pc-linux-gnu) "${D}"/usr/include/i686-pc-linux-gnu/'
+		eshopts_pop
 	fi
 }