Re #8359. Add required include.
Re #8359. Add another required include.

Someone else wasn't taking care of their own includes...