Forward-declare MainCharacter in header.
Merge remote-tracking branch 'origin/master' into res