Try to fix a windows warning. Refs #9933.
Fixed some header issue. Refs #9933.