Fix include paths and errors.