Pulling in patch from Marcus Leech for includes and older OSes.