Fix NVOBJECTDEFS