Update OSGi exports to match latest packages