fixup includes in commandline_options