Changed SURF, MSURF, and MLDB to SURF_O, MSURF_O, and MLDB_O to avoid naming conflict.