revert inclusion of options.h