corresponding fixups are omitted now. Also add the fixup for wchar.h that must have appeared sometime in the past. ok sthen@