#576 missing headers

Discussed with same person on IRC.