Fix imports in internal.common