[PATCH] i386: Fix double #includes in arch/i386