Move OptionItem and OptionsList declaration in cpp.