Rearrange includes