Reorder some #includes