Fix export definition order