rearrange some includes #533