Remove includes' dependency on $cli_factory