* i387-nat.c, i387-tdep.c: Unconditionally include "i386-tdep.h". * config/i386/tm-i386.h (FPU_REG_RAW_SIZE): Removed. (SIZEOF_FPU_REGS): Don't use FPU_REG_RAW_SIZE here.
* i387-nat.c: Include i386-tdep.h when multiarch. * i387-tdep.c: Ditto.