-#define str_format_meta( a, b ) __str_format_meta( VLC_OBJECT( a ), b )
-VLC_EXPORT( char *, __str_format_meta, ( vlc_object_t *, const char * ) );
-#define str_format( a, b ) __str_format( VLC_OBJECT( a ), b )
-VLC_EXPORT( char *, __str_format, ( vlc_object_t *, const char * ) );
+VLC_EXPORT( char *, str_format_meta, ( vlc_object_t *, const char * ) );
+#define str_format_meta( a, b ) str_format_meta( VLC_OBJECT( a ), b )
+VLC_EXPORT( char *, str_format, ( vlc_object_t *, const char * ) );
+#define str_format( a, b ) str_format( VLC_OBJECT( a ), b )