Make favorites API filename consistent, order compile includes for nice output