Fix include directives of external headers