Further cleanup of header includes.