Fix include replacements