improve includes in propertyguizeug