fix circular includes in property/