Use generated declarations in cursor.h  #849