Change the ordering of some imports to be more like merged master, so diff is smaller