fix include order in make files