Add missing #includes to pass 'make checkheaders'.