Add missing headers.

They're technically not required, but easier to add them than to
start hacking the code some more.