All delegators are now explicitely named (not T::Delegator).
Moved includes into kontr.h.