Can we move this to point_types.h or better use one of the structs defined there?