Refactor libvmi.h as to not have #defines