[num_geometries] Add missing includes, variant-related