make the conversions header public
cleanup CollisionAvoidance includes