fix some VS macro redefs