Add missing #includes to fix 'make checkheaders'.