refactor 'includes' support
stash