Changed _xdata, _near, etc and removed _generic from library files