refs #6485. Fix Doxygen + forward dec issues.