Fixes for includes required in a release build.

Refs #8784