Add missing header includes to fix 'make checkheaders'.