Re-arrange includes