Add missing header changes from D29226

Authored by broulik on Apr 29 2020, 8:34 AM.