core_options.c - get rid of some header dependencies