more cleanup, sorting and removing duplicate includes