RT #86974: Patch to output #includes in deterministic order