More fixed includes and forward declarations.