Adding some includes to appease build bots. Amends r203354