Fixed some header issue. Refs #9933.
Merge branch 'feature/9933_savegss_improve' into develop