Move ChannelSelection to own include