reorder and remove duplicate includes