SFM: fixed includes to be relative to libs/
SFM: SURF options struct, bundle prototyping