cb-include.cfg refactoring