Correct last patch to include wchar.h from system path.