Add necessary #includes to pass 'make checkheaders'.