Re #8359. Add more required includes.