In preparation for some large header changes, fix up any headers that aren't self-sufficient by adding needed includes or forward declarations.
In preparation for some large header changes, fix up any headers that aren't self-sufficient by adding needed includes or forward declarations.