Arrange includes so things converge in the correct order