fix circular inclusion