Add required headers to fix warnings during 'make checkheaders'.