Refs #15669; header fixes