Add missing headers to get 'make checkheaders' closer to passing.