Add missing headers to allow 'make checkheaders' to pass.