Fix up header includes.