This also means moving Mixin::Icon from CContainerBase one step down the inheritance hierarchy to resolve what would otherwise have been a circular include dependency.