move arch-specific internal headers into place