I don't suppose there's a way to accomplish this without the added include? I can just imagine them getting out of hand in some instances.

Though I want to clarify that's not blocking from me, added includes are better than significant src code changes. Just wondering.

I can just imagine them getting out of hand in some instances.

It is a natural result of splitting every feature into it's own file. A solution would be to at least combine the headers, maybe 1 for each kind of object (Actor, PlayState, etc).

I would be OK with that. I know we would want to avoid adding another OTRGlobals situation with them all in one header, but some grouping would reduce new include lines. Probably something we can deal with later as more things get converted, though. Maybe it's actually a non-issue.