Resolve include warnings and form generations for new property_type and the listing helper removed in d060278