after the previous round of changes (not regenerated with the bug 2051 stuff yet, was already in flight when that came through), there's one oddity: the lines defining __strdup and strerror_r are duplicated now.