From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 7 May 2011 20:02:08 +0000 (+0300)
Subject: Rename LIBVLC_* function attributes to VLC_* within plugin API
X-Git-Tag: 1.2.0-pre1~2762
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=92f1b3aee74871e264db419def5170f2e3512751;p=vlc

Rename LIBVLC_* function attributes to VLC_* within plugin API
---

diff --git a/include/vlc_access.h b/include/vlc_access.h
index e3e7eb9f35..f9475a8162 100644
--- a/include/vlc_access.h
+++ b/include/vlc_access.h
@@ -151,7 +151,7 @@ static inline void access_InitFields( access_t *p_a )
  * This function will return the parent input of this access.
  * It is retained. It can return NULL.
  */
-VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) LIBVLC_USED;
+VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) VLC_USED;
 
 #define ACCESS_SET_CALLBACKS( read, block, control, seek )              \
     p_access->pf_read = read;                                           \
diff --git a/include/vlc_acl.h b/include/vlc_acl.h
index 6ee019afa9..07b99df8e4 100644
--- a/include/vlc_acl.h
+++ b/include/vlc_acl.h
@@ -27,9 +27,9 @@
 
 
 VLC_API int ACL_Check( vlc_acl_t *p_acl, const char *psz_ip );
-VLC_API vlc_acl_t * ACL_Create( vlc_object_t *p_this, bool b_allow ) LIBVLC_USED LIBVLC_MALLOC;
+VLC_API vlc_acl_t * ACL_Create( vlc_object_t *p_this, bool b_allow ) VLC_USED VLC_MALLOC;
 #define ACL_Create(a, b) ACL_Create(VLC_OBJECT(a), b)
-VLC_API vlc_acl_t * ACL_Duplicate( vlc_object_t *p_this, const vlc_acl_t *p_acl ) LIBVLC_USED LIBVLC_MALLOC;
+VLC_API vlc_acl_t * ACL_Duplicate( vlc_object_t *p_this, const vlc_acl_t *p_acl ) VLC_USED VLC_MALLOC;
 #define ACL_Duplicate(a,b) ACL_Duplicate(VLC_OBJECT(a),b)
 VLC_API void ACL_Destroy( vlc_acl_t *p_acl );
 
diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 55f0d25768..7139d4328e 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -256,7 +256,7 @@ static const uint32_t pi_vlc_chan_order_wg4[] =
  * Prototypes
  *****************************************************************************/
 
-VLC_API aout_buffer_t * aout_OutputNextBuffer( aout_instance_t *, mtime_t, bool ) LIBVLC_USED;
+VLC_API aout_buffer_t * aout_OutputNextBuffer( aout_instance_t *, mtime_t, bool ) VLC_USED;
 
 /**
  * This function computes the reordering needed to go from pi_chan_order_in to
@@ -300,13 +300,13 @@ static inline unsigned aout_FormatNbChannels(const audio_sample_format_t *fmt)
     return popcount(fmt->i_physical_channels & AOUT_CHAN_PHYSMASK);
 }
 
-VLC_API unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) LIBVLC_USED;
+VLC_API unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) VLC_USED;
 VLC_API void aout_FormatPrepare( audio_sample_format_t * p_format );
 VLC_API void aout_FormatPrint( aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format );
-VLC_API const char * aout_FormatPrintChannels( const audio_sample_format_t * ) LIBVLC_USED;
+VLC_API const char * aout_FormatPrintChannels( const audio_sample_format_t * ) VLC_USED;
 
-VLC_API mtime_t aout_FifoFirstDate( aout_instance_t *, aout_fifo_t * ) LIBVLC_USED;
-VLC_API aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) LIBVLC_USED;
+VLC_API mtime_t aout_FifoFirstDate( aout_instance_t *, aout_fifo_t * ) VLC_USED;
+VLC_API aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) VLC_USED;
 
 /* From intf.c : */
 VLC_API void aout_VolumeSoftInit( aout_instance_t * );
@@ -330,7 +330,7 @@ VLC_API void aout_EnableFilter(vlc_object_t *, const char *, bool );
         aout_EnableFilter( VLC_OBJECT(o), n, b )
 
 /* */
-VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ) LIBVLC_USED;
+VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ) VLC_USED;
 
 # ifdef __cplusplus
 }
diff --git a/include/vlc_block.h b/include/vlc_block.h
index 92b9f29905..ce8d8e4d4d 100644
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -137,12 +137,12 @@ struct block_t
  * - block_Duplicate : create a copy of a block.
  ****************************************************************************/
 VLC_API void block_Init( block_t *, void *, size_t );
-VLC_API block_t * block_Alloc( size_t ) LIBVLC_USED;
-VLC_API block_t * block_Realloc( block_t *, ssize_t i_pre, size_t i_body ) LIBVLC_USED;
+VLC_API block_t * block_Alloc( size_t ) VLC_USED;
+VLC_API block_t * block_Realloc( block_t *, ssize_t i_pre, size_t i_body ) VLC_USED;
 
 #define block_New( dummy, size ) block_Alloc(size)
 
-LIBVLC_USED
+VLC_USED
 static inline block_t *block_Duplicate( block_t *p_block )
 {
     block_t *p_dup = block_Alloc( p_block->i_buffer );
@@ -165,9 +165,9 @@ static inline void block_Release( block_t *p_block )
     p_block->pf_release( p_block );
 }
 
-VLC_API block_t * block_heap_Alloc(void *, void *, size_t) LIBVLC_USED;
-VLC_API block_t * block_mmap_Alloc(void *addr, size_t length) LIBVLC_USED;
-VLC_API block_t * block_File(int fd) LIBVLC_USED;
+VLC_API block_t * block_heap_Alloc(void *, void *, size_t) VLC_USED;
+VLC_API block_t * block_mmap_Alloc(void *addr, size_t length) VLC_USED;
+VLC_API block_t * block_File(int fd) VLC_USED;
 
 static inline void block_Cleanup (void *block)
 {
@@ -306,15 +306,15 @@ static inline block_t *block_ChainGather( block_t *p_list )
  * block_FifoGet and block_FifoShow are cancellation points.
  ****************************************************************************/
 
-VLC_API block_fifo_t * block_FifoNew( void ) LIBVLC_USED;
+VLC_API block_fifo_t * block_FifoNew( void ) VLC_USED;
 VLC_API void block_FifoRelease( block_fifo_t * );
 VLC_API void block_FifoPace( block_fifo_t *fifo, size_t max_depth, size_t max_size );
 VLC_API void block_FifoEmpty( block_fifo_t * );
 VLC_API size_t block_FifoPut( block_fifo_t *, block_t * );
 VLC_API void block_FifoWake( block_fifo_t * );
-VLC_API block_t * block_FifoGet( block_fifo_t * ) LIBVLC_USED;
+VLC_API block_t * block_FifoGet( block_fifo_t * ) VLC_USED;
 VLC_API block_t * block_FifoShow( block_fifo_t * );
-size_t block_FifoSize( const block_fifo_t *p_fifo ) LIBVLC_USED;
-VLC_API size_t block_FifoCount( const block_fifo_t *p_fifo ) LIBVLC_USED;
+size_t block_FifoSize( const block_fifo_t *p_fifo ) VLC_USED;
+VLC_API size_t block_FifoCount( const block_fifo_t *p_fifo ) VLC_USED;
 
 #endif /* VLC_BLOCK_H */
diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h
index 7aa1989af0..d7b2763cd3 100644
--- a/include/vlc_block_helper.h
+++ b/include/vlc_block_helper.h
@@ -37,7 +37,7 @@ typedef struct block_bytestream_t
 /*****************************************************************************
  * block_bytestream_t management
  *****************************************************************************/
-LIBVLC_USED
+VLC_USED
 static inline block_bytestream_t block_BytestreamInit( void )
 {
     block_bytestream_t bytestream;
@@ -101,7 +101,7 @@ static inline void block_BytestreamPush( block_bytestream_t *p_bytestream,
     if( !p_bytestream->p_block ) p_bytestream->p_block = p_block;
 }
 
-LIBVLC_USED
+VLC_USED
 static inline block_t *block_BytestreamPop( block_bytestream_t *p_bytestream )
 {
     block_t *p_block;
diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index d9894a19f3..4fb08609ea 100644
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -32,27 +32,27 @@
 
 /* iconv wrappers (defined in src/extras/libc.c) */
 typedef void *vlc_iconv_t;
-VLC_API vlc_iconv_t vlc_iconv_open( const char *, const char * ) LIBVLC_USED;
-VLC_API size_t vlc_iconv( vlc_iconv_t, const char **, size_t *, char **, size_t * ) LIBVLC_USED;
+VLC_API vlc_iconv_t vlc_iconv_open( const char *, const char * ) VLC_USED;
+VLC_API size_t vlc_iconv( vlc_iconv_t, const char **, size_t *, char **, size_t * ) VLC_USED;
 VLC_API int vlc_iconv_close( vlc_iconv_t );
 
 #include <stdarg.h>
 
 VLC_API void LocaleFree( const char * );
-VLC_API char * FromLocale( const char * ) LIBVLC_USED;
-VLC_API char * FromLocaleDup( const char * ) LIBVLC_USED;
-VLC_API char * ToLocale( const char * ) LIBVLC_USED;
-VLC_API char * ToLocaleDup( const char * ) LIBVLC_USED;
+VLC_API char * FromLocale( const char * ) VLC_USED;
+VLC_API char * FromLocaleDup( const char * ) VLC_USED;
+VLC_API char * ToLocale( const char * ) VLC_USED;
+VLC_API char * ToLocaleDup( const char * ) VLC_USED;
 
 VLC_API int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap );
-VLC_API int utf8_fprintf( FILE *, const char *, ... ) LIBVLC_FORMAT( 2, 3 );
-VLC_API char * vlc_strcasestr(const char *, const char *) LIBVLC_USED;
+VLC_API int utf8_fprintf( FILE *, const char *, ... ) VLC_FORMAT( 2, 3 );
+VLC_API char * vlc_strcasestr(const char *, const char *) VLC_USED;
 
 VLC_API char * EnsureUTF8( char * );
-VLC_API const char * IsUTF8( const char * ) LIBVLC_USED;
+VLC_API const char * IsUTF8( const char * ) VLC_USED;
 
 #ifdef WIN32
-LIBVLC_USED
+VLC_USED
 static inline char *FromWide (const wchar_t *wide)
 {
     size_t len = WideCharToMultiByte (CP_UTF8, 0, wide, -1, NULL, 0, NULL, NULL);
@@ -66,7 +66,7 @@ static inline char *FromWide (const wchar_t *wide)
     return out;
 }
 
-LIBVLC_USED
+VLC_USED
 static inline wchar_t *ToWide (const char *utf8)
 {
     int len = MultiByteToWideChar (CP_UTF8, 0, utf8, -1, NULL, 0);
@@ -108,13 +108,13 @@ static inline char *FromLatin1 (const char *latin)
     return utf8 ? utf8 : str;
 }
 
-VLC_API char * FromCharset( const char *charset, const void *data, size_t data_size ) LIBVLC_USED;
-VLC_API void * ToCharset( const char *charset, const char *in, size_t *outsize ) LIBVLC_USED;
+VLC_API char * FromCharset( const char *charset, const void *data, size_t data_size ) VLC_USED;
+VLC_API void * ToCharset( const char *charset, const char *in, size_t *outsize ) VLC_USED;
 
-VLC_API double us_strtod( const char *, char ** ) LIBVLC_USED;
-VLC_API float us_strtof( const char *, char ** ) LIBVLC_USED;
-VLC_API double us_atof( const char * ) LIBVLC_USED;
+VLC_API double us_strtod( const char *, char ** ) VLC_USED;
+VLC_API float us_strtof( const char *, char ** ) VLC_USED;
+VLC_API double us_atof( const char * ) VLC_USED;
 VLC_API int us_vasprintf( char **, const char *, va_list );
-VLC_API int us_asprintf( char **, const char *, ... ) LIBVLC_USED;
+VLC_API int us_asprintf( char **, const char *, ... ) VLC_USED;
 
 #endif
diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index b8c8a083da..d7d7769b93 100644
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@@ -180,7 +180,7 @@ struct encoder_t
  * buffer. You have to release it using decoder_DeletePicture or by returning
  * it to the caller as a pf_decode_video return value.
  */
-VLC_API picture_t * decoder_NewPicture( decoder_t * ) LIBVLC_USED;
+VLC_API picture_t * decoder_NewPicture( decoder_t * ) VLC_USED;
 
 /**
  * This function will release a picture create by decoder_NewPicture.
@@ -204,7 +204,7 @@ VLC_API void decoder_UnlinkPicture( decoder_t *, picture_t * );
  * output buffer. You have to release it using decoder_DeleteAudioBuffer
  * or by returning it to the caller as a pf_decode_audio return value.
  */
-VLC_API aout_buffer_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) LIBVLC_USED;
+VLC_API aout_buffer_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) VLC_USED;
 
 /**
  * This function will release a audio buffer created by decoder_NewAudioBuffer.
@@ -216,7 +216,7 @@ VLC_API void decoder_DeleteAudioBuffer( decoder_t *, aout_buffer_t *p_buffer );
  * buffer. You have to release it using decoder_DeleteSubpicture or by returning
  * it to the caller as a pf_decode_sub return value.
  */
-VLC_API subpicture_t * decoder_NewSubpicture( decoder_t *, const subpicture_updater_t * ) LIBVLC_USED;
+VLC_API subpicture_t * decoder_NewSubpicture( decoder_t *, const subpicture_updater_t * ) VLC_USED;
 
 /**
  * This function will release a subpicture created by decoder_NewSubicture.
@@ -235,12 +235,12 @@ VLC_API int decoder_GetInputAttachments( decoder_t *, input_attachment_t ***ppp_
  * to mdate().
  * You MUST use it *only* for gathering statistics about speed.
  */
-VLC_API mtime_t decoder_GetDisplayDate( decoder_t *, mtime_t ) LIBVLC_USED;
+VLC_API mtime_t decoder_GetDisplayDate( decoder_t *, mtime_t ) VLC_USED;
 
 /**
  * This function returns the current input rate.
  * You MUST use it *only* for gathering statistics about speed.
  */
-VLC_API int decoder_GetDisplayRate( decoder_t * ) LIBVLC_USED;
+VLC_API int decoder_GetDisplayRate( decoder_t * ) VLC_USED;
 
 #endif /* _VLC_CODEC_H */
diff --git a/include/vlc_codec_synchro.h b/include/vlc_codec_synchro.h
index 0bb5dca3c2..2c48432d11 100644
--- a/include/vlc_codec_synchro.h
+++ b/include/vlc_codec_synchro.h
@@ -37,13 +37,13 @@
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-VLC_API decoder_synchro_t * decoder_SynchroInit( decoder_t *, int ) LIBVLC_USED;
+VLC_API decoder_synchro_t * decoder_SynchroInit( decoder_t *, int ) VLC_USED;
 VLC_API void decoder_SynchroRelease( decoder_synchro_t * );
 VLC_API void decoder_SynchroReset( decoder_synchro_t * );
 VLC_API bool decoder_SynchroChoose( decoder_synchro_t *, int, int, bool );
 VLC_API void decoder_SynchroTrash( decoder_synchro_t * );
 VLC_API void decoder_SynchroDecode( decoder_synchro_t * );
 VLC_API void decoder_SynchroEnd( decoder_synchro_t *, int, bool );
-VLC_API mtime_t decoder_SynchroDate( decoder_synchro_t * ) LIBVLC_USED;
+VLC_API mtime_t decoder_SynchroDate( decoder_synchro_t * ) VLC_USED;
 VLC_API void decoder_SynchroNewPicture( decoder_synchro_t *, int, int, mtime_t, mtime_t, bool );
 
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 1d02834fa0..3b94469647 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -75,22 +75,22 @@
 /* Format string sanity checks */
 #ifdef __GNUC__
 #   if defined( _WIN32 ) && (__GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) )
-#     define LIBVLC_FORMAT(x,y) __attribute__ ((format(gnu_printf,x,y)))
+#     define VLC_FORMAT(x,y) __attribute__ ((format(gnu_printf,x,y)))
 #   else
-#     define LIBVLC_FORMAT(x,y) __attribute__ ((format(printf,x,y)))
+#     define VLC_FORMAT(x,y) __attribute__ ((format(printf,x,y)))
 #   endif
-#   define LIBVLC_FORMAT_ARG(x) __attribute__ ((format_arg(x)))
+#   define VLC_FORMAT_ARG(x) __attribute__ ((format_arg(x)))
 #   if __GNUC__ > 3 || (__GNUC__ == 3 && (__GNUC_MINOR__ >= 4))
-#     define LIBVLC_USED __attribute__ ((warn_unused_result))
+#     define VLC_USED __attribute__ ((warn_unused_result))
 #   else
-#     define LIBVLC_USED
+#     define VLC_USED
 #   endif
-#   define LIBVLC_MALLOC __attribute__ ((malloc))
+#   define VLC_MALLOC __attribute__ ((malloc))
 #else
-#   define LIBVLC_FORMAT(x,y)
-#   define LIBVLC_FORMAT_ARG(x)
-#   define LIBVLC_USED
-#   define LIBVLC_MALLOC
+#   define VLC_FORMAT(x,y)
+#   define VLC_FORMAT_ARG(x)
+#   define VLC_USED
+#   define VLC_MALLOC
 #endif
 
 /* Branch prediction */
@@ -103,27 +103,27 @@
 #endif
 
 #if defined(__GNUC__) && !defined __cplusplus
-# define LIBVLC_DEPRECATED __attribute__((deprecated))
+# define VLC_DEPRECATED __attribute__((deprecated))
 #else
-# define LIBVLC_DEPRECATED
+# define VLC_DEPRECATED
 #endif
 
 /* Linkage */
 #ifdef __cplusplus
-# define LIBVLC_EXTERN extern "C"
+# define VLC_EXTERN extern "C"
 #else
-# define LIBVLC_EXTERN
+# define VLC_EXTERN
 #endif
 
 #if defined (WIN32) && defined (DLL_EXPORT)
-# define LIBVLC_EXPORT __declspec(dllexport)
+# define VLC_EXPORT __declspec(dllexport)
 #elif defined (__GNUC__) && (__GNUC__ >= 4)
-# define LIBVLC_EXPORT __attribute__((visibility("default")))
+# define VLC_EXPORT __attribute__((visibility("default")))
 #else
-# define LIBVLC_EXPORT
+# define VLC_EXPORT
 #endif
 
-#define VLC_API LIBVLC_EXTERN LIBVLC_EXPORT
+#define VLC_API VLC_EXTERN VLC_EXPORT
 
 
 /*****************************************************************************
@@ -582,7 +582,7 @@ VLC_API void vlc_release(gc_object_t *);
 #   define __MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
 #endif
 
-LIBVLC_USED
+VLC_USED
 static inline int64_t GCD ( int64_t a, int64_t b )
 {
     while( b )
@@ -595,7 +595,7 @@ static inline int64_t GCD ( int64_t a, int64_t b )
 }
 
 /* function imported from libavutil/common.h */
-LIBVLC_USED
+VLC_USED
 static inline uint8_t clip_uint8_vlc( int32_t a )
 {
     if( a&(~255) ) return (-a)>>31;
@@ -603,7 +603,7 @@ static inline uint8_t clip_uint8_vlc( int32_t a )
 }
 
 /* Count leading zeroes */
-LIBVLC_USED
+VLC_USED
 static inline unsigned clz (unsigned x)
 {
 #ifdef __GNUC_
@@ -626,7 +626,7 @@ static inline unsigned clz (unsigned x)
 #define clz32( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint32_t)) * 8))
 
 /* Bit weight */
-LIBVLC_USED
+VLC_USED
 static inline unsigned popcount (unsigned x)
 {
 #ifdef __GNUC_
@@ -647,20 +647,20 @@ static inline unsigned popcount (unsigned x)
 
 #define EMPTY_STR(str) (!str || !*str)
 
-VLC_API char const * vlc_error( int ) LIBVLC_USED;
+VLC_API char const * vlc_error( int ) VLC_USED;
 
 #include <vlc_arrays.h>
 
 /* MSB (big endian)/LSB (little endian) conversions - network order is always
  * MSB, and should be used for both network communications and files. */
-LIBVLC_USED
+VLC_USED
 static inline uint16_t U16_AT( const void * _p )
 {
     const uint8_t * p = (const uint8_t *)_p;
     return ( ((uint16_t)p[0] << 8) | p[1] );
 }
 
-LIBVLC_USED
+VLC_USED
 static inline uint32_t U32_AT( const void * _p )
 {
     const uint8_t * p = (const uint8_t *)_p;
@@ -668,7 +668,7 @@ static inline uint32_t U32_AT( const void * _p )
               | ((uint32_t)p[2] << 8) | p[3] );
 }
 
-LIBVLC_USED
+VLC_USED
 static inline uint64_t U64_AT( const void * _p )
 {
     const uint8_t * p = (const uint8_t *)_p;
@@ -678,14 +678,14 @@ static inline uint64_t U64_AT( const void * _p )
               | ((uint64_t)p[6] << 8) | p[7] );
 }
 
-LIBVLC_USED
+VLC_USED
 static inline uint16_t GetWLE( const void * _p )
 {
     const uint8_t * p = (const uint8_t *)_p;
     return ( ((uint16_t)p[1] << 8) | p[0] );
 }
 
-LIBVLC_USED
+VLC_USED
 static inline uint32_t GetDWLE( const void * _p )
 {
     const uint8_t * p = (const uint8_t *)_p;
@@ -693,7 +693,7 @@ static inline uint32_t GetDWLE( const void * _p )
               | ((uint32_t)p[1] << 8) | p[0] );
 }
 
-LIBVLC_USED
+VLC_USED
 static inline uint64_t GetQWLE( const void * _p )
 {
     const uint8_t * p = (const uint8_t *)_p;
@@ -756,7 +756,7 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
 #define ntoh16(i) ntohs(i)
 #define ntoh32(i) ntohl(i)
 
-LIBVLC_USED
+VLC_USED
 static inline uint64_t ntoh64 (uint64_t ll)
 {
     union { uint64_t qw; uint8_t b[16]; } v = { ll };
@@ -829,10 +829,10 @@ static inline uint64_t ntoh64 (uint64_t ll)
 
 VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t );
 
-VLC_API void * vlc_memalign( void **base, size_t alignment, size_t size ) LIBVLC_USED;
+VLC_API void * vlc_memalign( void **base, size_t alignment, size_t size ) VLC_USED;
 
 /* execve wrapper (defined in src/extras/libc.c) */
-VLC_API int vlc_execve( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) LIBVLC_USED;
+VLC_API int vlc_execve( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) VLC_USED;
 #define vlc_execve(a,b,c,d,e,f,g,h,i) vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i)
 
 VLC_API void vlc_tdestroy( void *, void (*)(void *) );
@@ -844,12 +844,12 @@ VLC_API void * vlc_memset( void *, int, size_t );
 /*****************************************************************************
  * I18n stuff
  *****************************************************************************/
-VLC_API char * vlc_gettext( const char *msgid ) LIBVLC_FORMAT_ARG(1);
+VLC_API char * vlc_gettext( const char *msgid ) VLC_FORMAT_ARG(1);
 
 #define vlc_pgettext( ctx, id ) \
         vlc_pgettext_aux( ctx "\004" id, id )
 
-LIBVLC_FORMAT_ARG(2)
+VLC_FORMAT_ARG(2)
 static inline const char *vlc_pgettext_aux( const char *ctx, const char *id )
 {
     const char *tr = vlc_gettext( ctx );
@@ -878,9 +878,9 @@ static inline void *xrealloc (void *ptr, size_t len)
 /*****************************************************************************
  * libvlc features
  *****************************************************************************/
-VLC_API const char * VLC_CompileBy( void ) LIBVLC_USED;
-VLC_API const char * VLC_CompileHost( void ) LIBVLC_USED;
-VLC_API const char * VLC_Compiler( void ) LIBVLC_USED;
+VLC_API const char * VLC_CompileBy( void ) VLC_USED;
+VLC_API const char * VLC_CompileHost( void ) VLC_USED;
+VLC_API const char * VLC_Compiler( void ) VLC_USED;
 
 /*****************************************************************************
  * Additional vlc stuff
diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 80962408d1..d998892f1b 100644
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -280,7 +280,7 @@ static const struct config_category_t categories_array[] =
     { -1, NULL, NULL }
 };
 
-LIBVLC_USED
+VLC_USED
 static inline const char *config_CategoryNameGet( int i_value )
 {
     int i = 0;
@@ -295,7 +295,7 @@ static inline const char *config_CategoryNameGet( int i_value )
     return NULL;
 }
 
-LIBVLC_USED
+VLC_USED
 static inline const char *config_CategoryHelpGet( int i_value )
 {
     int i = 0;
diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 41e9998859..36cdd5ac9c 100644
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -188,12 +188,12 @@ struct module_config_t
  * Prototypes - these methods are used to get, set or manipulate configuration
  * data.
  *****************************************************************************/
-VLC_API int config_GetType(vlc_object_t *, const char *) LIBVLC_USED;
-VLC_API int64_t config_GetInt(vlc_object_t *, const char *) LIBVLC_USED;
+VLC_API int config_GetType(vlc_object_t *, const char *) VLC_USED;
+VLC_API int64_t config_GetInt(vlc_object_t *, const char *) VLC_USED;
 VLC_API void config_PutInt(vlc_object_t *, const char *, int64_t);
-VLC_API float config_GetFloat(vlc_object_t *, const char *) LIBVLC_USED;
+VLC_API float config_GetFloat(vlc_object_t *, const char *) VLC_USED;
 VLC_API void config_PutFloat(vlc_object_t *, const char *, float);
-VLC_API char * config_GetPsz(vlc_object_t *, const char *) LIBVLC_USED LIBVLC_MALLOC;
+VLC_API char * config_GetPsz(vlc_object_t *, const char *) VLC_USED VLC_MALLOC;
 VLC_API void config_PutPsz(vlc_object_t *, const char *, const char *);
 
 VLC_API int config_SaveConfigFile( vlc_object_t * );
@@ -202,11 +202,11 @@ VLC_API int config_SaveConfigFile( vlc_object_t * );
 VLC_API void config_ResetAll( vlc_object_t * );
 #define config_ResetAll(a) config_ResetAll(VLC_OBJECT(a))
 
-VLC_API module_config_t * config_FindConfig( vlc_object_t *, const char * ) LIBVLC_USED;
-VLC_API char * config_GetDataDir( vlc_object_t * ) LIBVLC_USED LIBVLC_MALLOC;
+VLC_API module_config_t * config_FindConfig( vlc_object_t *, const char * ) VLC_USED;
+VLC_API char * config_GetDataDir( vlc_object_t * ) VLC_USED VLC_MALLOC;
 #define config_GetDataDir(a) config_GetDataDir(VLC_OBJECT(a))
-VLC_API const char * config_GetLibDir( void ) LIBVLC_USED;
-VLC_API const char * config_GetConfDir( void ) LIBVLC_USED;
+VLC_API const char * config_GetLibDir( void ) VLC_USED;
+VLC_API const char * config_GetConfDir( void ) VLC_USED;
 
 typedef enum vlc_userdir
 {
@@ -225,11 +225,11 @@ typedef enum vlc_userdir
     VLC_VIDEOS_DIR,
 } vlc_userdir_t;
 
-VLC_API char * config_GetUserDir( vlc_userdir_t ) LIBVLC_USED LIBVLC_MALLOC;
+VLC_API char * config_GetUserDir( vlc_userdir_t ) VLC_USED VLC_MALLOC;
 
 VLC_API void config_AddIntf( vlc_object_t *, const char * );
 VLC_API void config_RemoveIntf( vlc_object_t *, const char * );
-VLC_API bool config_ExistIntf( vlc_object_t *, const char * ) LIBVLC_USED;
+VLC_API bool config_ExistIntf( vlc_object_t *, const char * ) VLC_USED;
 
 #define config_GetType(a,b) config_GetType(VLC_OBJECT(a),b)
 #define config_GetInt(a,b) config_GetInt(VLC_OBJECT(a),b)
@@ -275,7 +275,7 @@ VLC_API void config_ChainParse( vlc_object_t *, const char *psz_prefix, const ch
  *
  * The options values are unescaped using config_StringUnescape.
  */
-VLC_API char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, const char *psz_string ) LIBVLC_USED LIBVLC_MALLOC;
+VLC_API char *config_ChainCreate( char **ppsz_name, config_chain_t **pp_cfg, const char *psz_string ) VLC_USED VLC_MALLOC;
 
 /**
  * This function will release a linked list of config_chain_t
@@ -286,7 +286,7 @@ VLC_API void config_ChainDestroy( config_chain_t * );
 /**
  * This function will duplicate a linked list of config_chain_t
  */
-VLC_API config_chain_t * config_ChainDuplicate( const config_chain_t * ) LIBVLC_USED LIBVLC_MALLOC;
+VLC_API config_chain_t * config_ChainDuplicate( const config_chain_t * ) VLC_USED VLC_MALLOC;
 
 /**
  * This function will unescape a string in place and will return a pointer on
@@ -308,7 +308,7 @@ VLC_API char * config_StringUnescape( char *psz_string );
  *
  * The escaped characters are ' " and \
  */
-VLC_API char * config_StringEscape( const char *psz_string ) LIBVLC_USED LIBVLC_MALLOC;
+VLC_API char * config_StringEscape( const char *psz_string ) VLC_USED VLC_MALLOC;
 
 # ifdef __cplusplus
 }
diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 33735c443f..248289b2c0 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -167,7 +167,7 @@ VLC_API int demux_vaControlHelper( stream_t *, int64_t i_start, int64_t i_end, i
  * Miscellaneous helpers for demuxers
  *************************************************************************/
 
-LIBVLC_USED
+VLC_USED
 static inline bool demux_IsPathExtension( demux_t *p_demux, const char *psz_extension )
 {
     if( !p_demux->psz_file )
@@ -179,7 +179,7 @@ static inline bool demux_IsPathExtension( demux_t *p_demux, const char *psz_exte
     return true;
 }
 
-LIBVLC_USED
+VLC_USED
 static inline bool demux_IsForced( demux_t *p_demux, const char *psz_name )
 {
    if( !p_demux->psz_demux || strcmp( p_demux->psz_demux, psz_name ) )
@@ -194,7 +194,7 @@ static inline bool demux_IsForced( demux_t *p_demux, const char *psz_name )
  * The provided es_format_t will be cleaned on error or by
  * demux_PacketizerDestroy.
  */
-VLC_API decoder_t * demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) LIBVLC_USED;
+VLC_API decoder_t * demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) VLC_USED;
 
 /**
  * This function will destroy a packetizer create by demux_PacketizerNew.
@@ -205,7 +205,7 @@ VLC_API void demux_PacketizerDestroy( decoder_t *p_packetizer );
  * This function will return the parent input of this demux.
  * It is retained. Can return NULL.
  */
-VLC_API input_thread_t * demux_GetParentInput( demux_t *p_demux ) LIBVLC_USED;
+VLC_API input_thread_t * demux_GetParentInput( demux_t *p_demux ) VLC_USED;
 
 /* */
 #define DEMUX_INIT_COMMON() do {            \
diff --git a/include/vlc_dialog.h b/include/vlc_dialog.h
index 62432d161b..6df9ad7da3 100644
--- a/include/vlc_dialog.h
+++ b/include/vlc_dialog.h
@@ -39,7 +39,7 @@ typedef struct dialog_fatal_t
 
 VLC_API void dialog_VFatal(vlc_object_t *, bool, const char *, const char *, va_list);
 
-static inline LIBVLC_FORMAT(3, 4)
+static inline VLC_FORMAT(3, 4)
 void dialog_Fatal (vlc_object_t *obj, const char *title, const char *fmt, ...)
 {
      va_list ap;
@@ -51,7 +51,7 @@ void dialog_Fatal (vlc_object_t *obj, const char *title, const char *fmt, ...)
 #define dialog_Fatal(o, t, ...) \
         dialog_Fatal(VLC_OBJECT(o), t, __VA_ARGS__)
 
-static inline LIBVLC_FORMAT(3, 4)
+static inline VLC_FORMAT(3, 4)
 void dialog_FatalWait (vlc_object_t *obj, const char *title,
                        const char *fmt, ...){
      va_list ap;
@@ -74,7 +74,7 @@ typedef struct dialog_login_t
     char **password;
 } dialog_login_t;
 
-VLC_API void dialog_Login(vlc_object_t *, char **, char **, const char *, const char *, ...) LIBVLC_FORMAT (5, 6);
+VLC_API void dialog_Login(vlc_object_t *, char **, char **, const char *, const char *, ...) VLC_FORMAT (5, 6);
 #define dialog_Login(o, u, p, t, ...) \
         dialog_Login(VLC_OBJECT(o), u, p, t, __VA_ARGS__)
 
@@ -107,7 +107,7 @@ typedef struct dialog_progress_bar_t
     void *p_sys;
 } dialog_progress_bar_t;
 
-VLC_API dialog_progress_bar_t * dialog_ProgressCreate(vlc_object_t *, const char *, const char *, const char *) LIBVLC_USED;
+VLC_API dialog_progress_bar_t * dialog_ProgressCreate(vlc_object_t *, const char *, const char *, const char *) VLC_USED;
 #define dialog_ProgressCreate(o, t, m, c) \
         dialog_ProgressCreate(VLC_OBJECT(o), t, m, c)
 VLC_API void dialog_ProgressDestroy(dialog_progress_bar_t *);
diff --git a/include/vlc_epg.h b/include/vlc_epg.h
index 2adb2f1ba8..e08acfad1f 100644
--- a/include/vlc_epg.h
+++ b/include/vlc_epg.h
@@ -73,7 +73,7 @@ VLC_API void vlc_epg_AddEvent(vlc_epg_t *p_epg, int64_t i_start, int i_duration,
  *
  * You must call vlc_epg_Delete to release the associated resource.
  */
-VLC_API vlc_epg_t * vlc_epg_New(const char *psz_name) LIBVLC_USED;
+VLC_API vlc_epg_t * vlc_epg_New(const char *psz_name) VLC_USED;
 
 /**
  * It releases a vlc_epg_t*.
diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 57fc5c003a..2aae595535 100644
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -104,7 +104,7 @@ struct es_out_t
     es_out_sys_t    *p_sys;
 };
 
-LIBVLC_USED
+VLC_USED
 static inline es_out_id_t * es_out_Add( es_out_t *out, const es_format_t *fmt )
 {
     return out->pf_add( out, fmt );
diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index e0fb121aa2..f7b536d3f3 100644
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -248,7 +248,7 @@ static inline int filter_GetInputAttachments( filter_t *p_filter,
  * Only the chroma properties of the dest format is used (chroma
  * type, rgb masks and shifts)
  */
-VLC_API filter_t * filter_NewBlend( vlc_object_t *, const video_format_t *p_dst_chroma ) LIBVLC_USED;
+VLC_API filter_t * filter_NewBlend( vlc_object_t *, const video_format_t *p_dst_chroma ) VLC_USED;
 
 /**
  * It configures blend filter parameters that are allowed to changed
@@ -307,7 +307,7 @@ typedef struct filter_chain_t filter_chain_t;
  * \param p_buffer_allocation_data pointer to private allocation data
  * \return pointer to a filter chain
  */
-VLC_API filter_chain_t * filter_chain_New( vlc_object_t *, const char *, bool, int (*)( filter_t *, void * ), void (*)( filter_t * ), void *  ) LIBVLC_USED;
+VLC_API filter_chain_t * filter_chain_New( vlc_object_t *, const char *, bool, int (*)( filter_t *, void * ), void (*)( filter_t * ), void *  ) VLC_USED;
 #define filter_chain_New( a, b, c, d, e, f ) filter_chain_New( VLC_OBJECT( a ), b, c, d, e, f )
 
 /**
diff --git a/include/vlc_fs.h b/include/vlc_fs.h
index fb119448b0..e3ab442db8 100644
--- a/include/vlc_fs.h
+++ b/include/vlc_fs.h
@@ -31,12 +31,12 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-VLC_API int vlc_open( const char *filename, int flags, ... ) LIBVLC_USED;
-VLC_API FILE * vlc_fopen( const char *filename, const char *mode ) LIBVLC_USED;
-VLC_API int vlc_openat( int fd, const char *filename, int flags, ... ) LIBVLC_USED;
+VLC_API int vlc_open( const char *filename, int flags, ... ) VLC_USED;
+VLC_API FILE * vlc_fopen( const char *filename, const char *mode ) VLC_USED;
+VLC_API int vlc_openat( int fd, const char *filename, int flags, ... ) VLC_USED;
 
-VLC_API DIR * vlc_opendir( const char *dirname ) LIBVLC_USED;
-VLC_API char * vlc_readdir( DIR *dir ) LIBVLC_USED;
+VLC_API DIR * vlc_opendir( const char *dirname ) VLC_USED;
+VLC_API char * vlc_readdir( DIR *dir ) VLC_USED;
 VLC_API int vlc_loaddir( DIR *dir, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) );
 VLC_API int vlc_scandir( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) );
 VLC_API int vlc_mkdir( const char *filename, mode_t mode );
diff --git a/include/vlc_http.h b/include/vlc_http.h
index ecdb0a7f4c..ce612794ae 100644
--- a/include/vlc_http.h
+++ b/include/vlc_http.h
@@ -62,6 +62,6 @@ VLC_API int http_auth_ParseAuthenticationInfoHeader
 VLC_API char *http_auth_FormatAuthorizationHeader
             ( vlc_object_t *, http_auth_t *,
               const char *, const char *,
-              const char *, const char * ) LIBVLC_USED;
+              const char *, const char * ) VLC_USED;
 
 #endif /* VLC_HTTP_H */
diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h
index 954189e13f..6e3c6f1995 100644
--- a/include/vlc_httpd.h
+++ b/include/vlc_httpd.h
@@ -99,15 +99,15 @@ struct httpd_message_t
 };
 
 /* create a new host */
-VLC_API httpd_host_t * httpd_HostNew( vlc_object_t *, const char *psz_host, int i_port ) LIBVLC_USED;
-VLC_API httpd_host_t * httpd_TLSHostNew( vlc_object_t *, const char *, int, const char *, const char *, const char *, const char * ) LIBVLC_USED;
+VLC_API httpd_host_t * httpd_HostNew( vlc_object_t *, const char *psz_host, int i_port ) VLC_USED;
+VLC_API httpd_host_t * httpd_TLSHostNew( vlc_object_t *, const char *, int, const char *, const char *, const char *, const char * ) VLC_USED;
 
 /* delete a host */
 VLC_API void httpd_HostDelete( httpd_host_t * );
 
 /* register a new url */
-VLC_API httpd_url_t * httpd_UrlNew( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) LIBVLC_USED;
-VLC_API httpd_url_t * httpd_UrlNewUnique( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) LIBVLC_USED;
+VLC_API httpd_url_t * httpd_UrlNew( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) VLC_USED;
+VLC_API httpd_url_t * httpd_UrlNewUnique( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) VLC_USED;
 /* register callback on a url */
 VLC_API int httpd_UrlCatch( httpd_url_t *, int i_msg, httpd_callback_t, httpd_callback_sys_t * );
 /* delete a url */
@@ -121,26 +121,26 @@ VLC_API char* httpd_ServerIP( const httpd_client_t *cl, char *psz_ip );
 
 /* High level */
 
-VLC_API httpd_file_t * httpd_FileNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t * ) LIBVLC_USED;
+VLC_API httpd_file_t * httpd_FileNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t * ) VLC_USED;
 VLC_API httpd_file_sys_t * httpd_FileDelete( httpd_file_t * );
 
 
-VLC_API httpd_handler_t * httpd_HandlerNew( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t * ) LIBVLC_USED;
+VLC_API httpd_handler_t * httpd_HandlerNew( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t * ) VLC_USED;
 VLC_API httpd_handler_sys_t * httpd_HandlerDelete( httpd_handler_t * );
 
 
-VLC_API httpd_redirect_t * httpd_RedirectNew( httpd_host_t *, const char *psz_url_dst, const char *psz_url_src ) LIBVLC_USED;
+VLC_API httpd_redirect_t * httpd_RedirectNew( httpd_host_t *, const char *psz_url_dst, const char *psz_url_src ) VLC_USED;
 VLC_API void httpd_RedirectDelete( httpd_redirect_t * );
 
 
-VLC_API httpd_stream_t * httpd_StreamNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) LIBVLC_USED;
+VLC_API httpd_stream_t * httpd_StreamNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) VLC_USED;
 VLC_API void httpd_StreamDelete( httpd_stream_t * );
 VLC_API int httpd_StreamHeader( httpd_stream_t *, uint8_t *p_data, int i_data );
 VLC_API int httpd_StreamSend( httpd_stream_t *, uint8_t *p_data, int i_data );
 
 
 /* Msg functions facilities */
-VLC_API void httpd_MsgAdd( httpd_message_t *, const char *psz_name, const char *psz_value, ... ) LIBVLC_FORMAT( 3, 4 );
+VLC_API void httpd_MsgAdd( httpd_message_t *, const char *psz_name, const char *psz_value, ... ) VLC_FORMAT( 3, 4 );
 /* return "" if not found. The string is not allocated */
 VLC_API const char * httpd_MsgGet( const httpd_message_t *, const char *psz_name );
 
diff --git a/include/vlc_image.h b/include/vlc_image.h
index 9be2e55388..676875a4c2 100644
--- a/include/vlc_image.h
+++ b/include/vlc_image.h
@@ -59,7 +59,7 @@ struct image_handler_t
     filter_t  *p_filter;
 };
 
-VLC_API image_handler_t * image_HandlerCreate( vlc_object_t * ) LIBVLC_USED;
+VLC_API image_handler_t * image_HandlerCreate( vlc_object_t * ) VLC_USED;
 #define image_HandlerCreate( a ) image_HandlerCreate( VLC_OBJECT(a) )
 VLC_API void image_HandlerDelete( image_handler_t * );
 
diff --git a/include/vlc_input.h b/include/vlc_input.h
index 0d26be716b..7b052e9ebf 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -526,10 +526,10 @@ enum input_query_e
  * Prototypes
  *****************************************************************************/
 
-VLC_API input_thread_t * input_Create( vlc_object_t *p_parent, input_item_t *, const char *psz_log, input_resource_t * ) LIBVLC_USED;
+VLC_API input_thread_t * input_Create( vlc_object_t *p_parent, input_item_t *, const char *psz_log, input_resource_t * ) VLC_USED;
 #define input_Create(a,b,c,d) input_Create(VLC_OBJECT(a),b,c,d)
 
-VLC_API input_thread_t * input_CreateAndStart( vlc_object_t *p_parent, input_item_t *, const char *psz_log ) LIBVLC_USED;
+VLC_API input_thread_t * input_CreateAndStart( vlc_object_t *p_parent, input_item_t *, const char *psz_log ) VLC_USED;
 #define input_CreateAndStart(a,b,c) input_CreateAndStart(VLC_OBJECT(a),b,c)
 
 VLC_API int input_Start( input_thread_t * );
@@ -549,7 +549,7 @@ VLC_API int input_Control( input_thread_t *, int i_query, ...  );
  * You have to keep a reference to the input or to the input_item_t until
  * you do not need it anymore.
  */
-VLC_API input_item_t* input_GetItem( input_thread_t * ) LIBVLC_USED;
+VLC_API input_item_t* input_GetItem( input_thread_t * ) VLC_USED;
 
 /**
  * It will return the current state of the input.
@@ -635,7 +635,7 @@ static inline int input_ModifyPcrSystem( input_thread_t *p_input, bool b_absolut
 }
 
 /* */
-VLC_API decoder_t * input_DecoderCreate( vlc_object_t *, es_format_t *, input_resource_t * ) LIBVLC_USED;
+VLC_API decoder_t * input_DecoderCreate( vlc_object_t *, es_format_t *, input_resource_t * ) VLC_USED;
 VLC_API void input_DecoderDelete( decoder_t * );
 VLC_API void input_DecoderDecode( decoder_t *, block_t *, bool b_do_pace );
 
@@ -651,7 +651,7 @@ VLC_API void input_SplitMRL( const char **ppsz_access, const char **ppsz_demux,
 /**
  * This function creates a sane filename path.
  */
-VLC_API char * input_CreateFilename( vlc_object_t *, const char *psz_path, const char *psz_prefix, const char *psz_extension ) LIBVLC_USED;
+VLC_API char * input_CreateFilename( vlc_object_t *, const char *psz_path, const char *psz_prefix, const char *psz_extension ) VLC_USED;
 
 /**
  * It creates an empty input resource handler.
@@ -659,7 +659,7 @@ VLC_API char * input_CreateFilename( vlc_object_t *, const char *psz_path, const
  * The given object MUST stay alive as long as the input_resource_t is
  * not deleted.
  */
-VLC_API input_resource_t * input_resource_New( vlc_object_t * ) LIBVLC_USED;
+VLC_API input_resource_t * input_resource_New( vlc_object_t * ) VLC_USED;
 
 /**
  * It releases an input resource.
diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
index f95dc7b42e..45cc4d2e7c 100644
--- a/include/vlc_input_item.h
+++ b/include/vlc_input_item.h
@@ -135,7 +135,7 @@ VLC_API void input_item_PostSubItem( input_item_t *p_parent, input_item_t *p_chi
  *
  * Create a root node to hold a tree of subitems for given item
  */
-VLC_API input_item_node_t * input_item_node_Create( input_item_t *p_input ) LIBVLC_USED;
+VLC_API input_item_node_t * input_item_node_Create( input_item_t *p_input ) VLC_USED;
 
 /**
  * Add a new child node to this parent node that will point to this subitem.
@@ -189,10 +189,10 @@ VLC_API int input_item_AddOption(input_item_t *, const char *, unsigned i_flags
 VLC_API bool input_item_HasErrorWhenReading( input_item_t * );
 VLC_API void input_item_SetMeta( input_item_t *, vlc_meta_type_t meta_type, const char *psz_val );
 VLC_API bool input_item_MetaMatch( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz );
-VLC_API char * input_item_GetMeta( input_item_t *p_i, vlc_meta_type_t meta_type ) LIBVLC_USED;
-VLC_API char * input_item_GetName( input_item_t * p_i ) LIBVLC_USED;
-VLC_API char * input_item_GetTitleFbName( input_item_t * p_i ) LIBVLC_USED;
-VLC_API char * input_item_GetURI( input_item_t * p_i ) LIBVLC_USED;
+VLC_API char * input_item_GetMeta( input_item_t *p_i, vlc_meta_type_t meta_type ) VLC_USED;
+VLC_API char * input_item_GetName( input_item_t * p_i ) VLC_USED;
+VLC_API char * input_item_GetTitleFbName( input_item_t * p_i ) VLC_USED;
+VLC_API char * input_item_GetURI( input_item_t * p_i ) VLC_USED;
 VLC_API void input_item_SetURI( input_item_t * p_i, const char *psz_uri );
 VLC_API mtime_t input_item_GetDuration( input_item_t * p_i );
 VLC_API void input_item_SetDuration( input_item_t * p_i, mtime_t i_duration );
@@ -234,8 +234,8 @@ INPUT_META(TrackID)
 #define input_item_SetArtURL   input_item_SetArtworkURL
 #define input_item_GetArtURL   input_item_GetArtworkURL
 
-VLC_API char * input_item_GetInfo( input_item_t *p_i, const char *psz_cat,const char *psz_name ) LIBVLC_USED;
-VLC_API int input_item_AddInfo( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) LIBVLC_FORMAT( 4, 5 );
+VLC_API char * input_item_GetInfo( input_item_t *p_i, const char *psz_cat,const char *psz_name ) VLC_USED;
+VLC_API int input_item_AddInfo( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) VLC_FORMAT( 4, 5 );
 VLC_API int input_item_DelInfo( input_item_t *p_i, const char *psz_cat, const char *psz_name );
 VLC_API void input_item_ReplaceInfos( input_item_t *, info_category_t * );
 VLC_API void input_item_MergeInfos( input_item_t *, info_category_t * );
@@ -246,14 +246,14 @@ VLC_API void input_item_MergeInfos( input_item_t *, info_category_t * );
  * XXX You may also use input_item_New or input_item_NewExt as they need
  * less arguments.
  */
-VLC_API input_item_t * input_item_NewWithType( vlc_object_t *, const char *psz_uri, const char *psz_name, int i_options, const char *const *ppsz_options, unsigned i_option_flags, mtime_t i_duration, int i_type ) LIBVLC_USED;
+VLC_API input_item_t * input_item_NewWithType( vlc_object_t *, const char *psz_uri, const char *psz_name, int i_options, const char *const *ppsz_options, unsigned i_option_flags, mtime_t i_duration, int i_type ) VLC_USED;
 
 /**
  * This function creates a new input_item_t with the provided information.
  *
  * Provided for convenience.
  */
-VLC_API input_item_t * input_item_NewExt(vlc_object_t *, const char *psz_uri, const char *psz_name, int i_options, const char *const *ppsz_options, unsigned i_option_flags, mtime_t i_duration ) LIBVLC_USED;
+VLC_API input_item_t * input_item_NewExt(vlc_object_t *, const char *psz_uri, const char *psz_name, int i_options, const char *const *ppsz_options, unsigned i_option_flags, mtime_t i_duration ) VLC_USED;
 #define input_item_NewExt(a,b,c,d,e,f,g) input_item_NewExt( VLC_OBJECT(a),b,c,d,e,f,g)
 
 /**
@@ -266,7 +266,7 @@ VLC_API input_item_t * input_item_NewExt(vlc_object_t *, const char *psz_uri, co
 /**
  * This function creates a new input_item_t as a copy of another.
  */
-VLC_API input_item_t * input_item_Copy(vlc_object_t *, input_item_t * ) LIBVLC_USED;
+VLC_API input_item_t * input_item_Copy(vlc_object_t *, input_item_t * ) VLC_USED;
 
 
 /******************
diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index 4690c8fc15..ca394fda57 100644
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -86,8 +86,8 @@
 #define KEY_MOUSEWHEELLEFT   0x00F20000
 #define KEY_MOUSEWHEELRIGHT  0x00F30000
 
-VLC_API char *vlc_keycode2str(uint_fast32_t i_key) LIBVLC_USED;
-VLC_API uint_fast32_t vlc_str2keycode(const char *str) LIBVLC_USED;
+VLC_API char *vlc_keycode2str(uint_fast32_t i_key) VLC_USED;
+VLC_API uint_fast32_t vlc_str2keycode(const char *str) VLC_USED;
 
 typedef enum vlc_action {
     ACTIONID_NONE = 0,
@@ -202,7 +202,7 @@ typedef enum vlc_action {
 
 } vlc_action_t;
 
-VLC_API vlc_action_t vlc_GetActionId(const char *psz_key) LIBVLC_USED;
+VLC_API vlc_action_t vlc_GetActionId(const char *psz_key) VLC_USED;
 
 struct hotkey
 {
diff --git a/include/vlc_messages.h b/include/vlc_messages.h
index b568d3385d..6b2bef07e9 100644
--- a/include/vlc_messages.h
+++ b/include/vlc_messages.h
@@ -87,7 +87,7 @@ typedef struct msg_subscription_t msg_subscription_t;
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-VLC_API void msg_Generic( vlc_object_t *, int, const char *, const char *, ... ) LIBVLC_FORMAT( 4, 5 );
+VLC_API void msg_Generic( vlc_object_t *, int, const char *, const char *, ... ) VLC_FORMAT( 4, 5 );
 VLC_API void msg_GenericVa( vlc_object_t *, int, const char *, const char *, va_list args );
 #define msg_GenericVa(a, b, c, d, e) msg_GenericVa(VLC_OBJECT(a), b, c, d, e)
 
@@ -112,7 +112,7 @@ typedef struct msg_cb_data_t msg_cb_data_t;
  */
 typedef void (*msg_callback_t) (msg_cb_data_t *, msg_item_t *, unsigned);
 
-VLC_API msg_subscription_t* msg_Subscribe( libvlc_int_t *, msg_callback_t, msg_cb_data_t * ) LIBVLC_USED;
+VLC_API msg_subscription_t* msg_Subscribe( libvlc_int_t *, msg_callback_t, msg_cb_data_t * ) VLC_USED;
 VLC_API void msg_Unsubscribe( msg_subscription_t * );
 VLC_API void msg_SubscriptionSetVerbosity( msg_subscription_t *, const int);
 
diff --git a/include/vlc_meta.h b/include/vlc_meta.h
index b6a0f64aeb..a5278e7792 100644
--- a/include/vlc_meta.h
+++ b/include/vlc_meta.h
@@ -63,7 +63,7 @@ typedef enum vlc_meta_type_t
  */
 struct vlc_meta_t;
 
-VLC_API vlc_meta_t * vlc_meta_New( void ) LIBVLC_USED;
+VLC_API vlc_meta_t * vlc_meta_New( void ) VLC_USED;
 VLC_API void vlc_meta_Delete( vlc_meta_t *m );
 VLC_API void vlc_meta_Set( vlc_meta_t *p_meta, vlc_meta_type_t meta_type, const char *psz_val );
 VLC_API const char * vlc_meta_Get( const vlc_meta_t *p_meta, vlc_meta_type_t meta_type );
@@ -76,7 +76,7 @@ VLC_API unsigned vlc_meta_GetExtraCount( const vlc_meta_t *m );
  * Allocate a copy of all extra meta names and a table with it.
  * Be sure to free both the returned pointers and its name.
  */
-VLC_API char ** vlc_meta_CopyExtraNames( const vlc_meta_t *m ) LIBVLC_USED;
+VLC_API char ** vlc_meta_CopyExtraNames( const vlc_meta_t *m ) VLC_USED;
 
 VLC_API void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src );
 
diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index 0fdbb0c490..68160d7339 100644
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -33,47 +33,47 @@ typedef void (*vlc_deactivate_t)(void *func, va_list args);
  * Exported functions.
  *****************************************************************************/
 
-VLC_API module_t * vlc_module_load( vlc_object_t *obj, const char *cap, const char *name, bool strict, vlc_activate_t probe, ... ) LIBVLC_USED;
+VLC_API module_t * vlc_module_load( vlc_object_t *obj, const char *cap, const char *name, bool strict, vlc_activate_t probe, ... ) VLC_USED;
 #define vlc_module_load(o,c,n,s,...) \
         vlc_module_load(VLC_OBJECT(o),c,n,s,__VA_ARGS__)
 VLC_API void vlc_module_unload( module_t *, vlc_deactivate_t deinit, ... );
 
-VLC_API module_t * module_need( vlc_object_t *, const char *, const char *, bool ) LIBVLC_USED;
+VLC_API module_t * module_need( vlc_object_t *, const char *, const char *, bool ) VLC_USED;
 #define module_need(a,b,c,d) module_need(VLC_OBJECT(a),b,c,d)
 VLC_API void module_unneed( vlc_object_t *, module_t * );
 #define module_unneed(a,b) module_unneed(VLC_OBJECT(a),b)
-VLC_API bool module_exists(const char *) LIBVLC_USED;
-VLC_API module_t * module_find(const char *) LIBVLC_USED;
+VLC_API bool module_exists(const char *) VLC_USED;
+VLC_API module_t * module_find(const char *) VLC_USED;
 
 int module_start(vlc_object_t *, module_t *);
 #define module_start(o, m) module_start(VLC_OBJECT(o),m)
 void module_stop(vlc_object_t *, module_t *);
 #define module_stop(o, m) module_stop(VLC_OBJECT(o),m)
 
-VLC_API module_config_t * module_config_get( const module_t *, unsigned * ) LIBVLC_USED;
+VLC_API module_config_t * module_config_get( const module_t *, unsigned * ) VLC_USED;
 VLC_API void module_config_free( module_config_t * );
 
 VLC_API module_t * module_hold(module_t *module);
 VLC_API void module_release(module_t *module);
 VLC_API void module_list_free(module_t **);
-VLC_API module_t ** module_list_get(size_t *n) LIBVLC_USED;
+VLC_API module_t ** module_list_get(size_t *n) VLC_USED;
 
 VLC_API bool module_provides( const module_t *m, const char *cap );
-VLC_API const char * module_get_object( const module_t *m ) LIBVLC_USED;
-VLC_API const char * module_get_name( const module_t *m, bool long_name ) LIBVLC_USED;
+VLC_API const char * module_get_object( const module_t *m ) VLC_USED;
+VLC_API const char * module_get_name( const module_t *m, bool long_name ) VLC_USED;
 #define module_GetLongName( m ) module_get_name( m, true )
-VLC_API const char * module_get_help( const module_t *m ) LIBVLC_USED;
-VLC_API const char * module_get_capability( const module_t *m ) LIBVLC_USED;
-VLC_API int module_get_score( const module_t *m ) LIBVLC_USED;
-VLC_API const char * module_gettext( const module_t *, const char * ) LIBVLC_USED;
+VLC_API const char * module_get_help( const module_t *m ) VLC_USED;
+VLC_API const char * module_get_capability( const module_t *m ) VLC_USED;
+VLC_API int module_get_score( const module_t *m ) VLC_USED;
+VLC_API const char * module_gettext( const module_t *, const char * ) VLC_USED;
 
-LIBVLC_USED static inline module_t *module_get_main (void)
+VLC_USED static inline module_t *module_get_main (void)
 {
     return module_find ("main");
 }
 #define module_get_main(a) module_get_main()
 
-LIBVLC_USED static inline bool module_is_main( const module_t * p_module )
+VLC_USED static inline bool module_is_main( const module_t * p_module )
 {
     return !strcmp( module_get_object( p_module ), "main" );
 }
diff --git a/include/vlc_network.h b/include/vlc_network.h
index d00b9079c1..4e506fa346 100644
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -85,10 +85,10 @@ struct msghdr
 #   undef IPV6_JOIN_GROUP
 #endif
 
-int vlc_socket (int, int, int, bool nonblock) LIBVLC_USED;
+int vlc_socket (int, int, int, bool nonblock) VLC_USED;
 
 struct sockaddr;
-VLC_API int vlc_accept( int, struct sockaddr *, socklen_t *, bool ) LIBVLC_USED;
+VLC_API int vlc_accept( int, struct sockaddr *, socklen_t *, bool ) VLC_USED;
 
 # ifdef __cplusplus
 extern "C" {
@@ -158,7 +158,7 @@ VLC_API char * net_Gets( vlc_object_t *p_this, int fd, const v_socket_t * );
 #define net_Gets(a,b,c) net_Gets(VLC_OBJECT(a),b,c)
 
 
-VLC_API ssize_t net_Printf( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, ... ) LIBVLC_FORMAT( 4, 5 );
+VLC_API ssize_t net_Printf( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, ... ) VLC_FORMAT( 4, 5 );
 #define net_Printf(o,fd,vs,...) net_Printf(VLC_OBJECT(o),fd,vs, __VA_ARGS__)
 VLC_API ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args );
 #define net_vaPrintf(a,b,c,d,e) net_vaPrintf(VLC_OBJECT(a),b,c,d,e)
diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index a677d8a86b..7fe95d5d88 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -62,14 +62,14 @@ struct vlc_object_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-VLC_API void *vlc_object_create( vlc_object_t *, size_t ) LIBVLC_MALLOC LIBVLC_USED;
+VLC_API void *vlc_object_create( vlc_object_t *, size_t ) VLC_MALLOC VLC_USED;
 VLC_API void vlc_object_attach( vlc_object_t *, vlc_object_t * );
-VLC_API vlc_object_t *vlc_object_find_name( vlc_object_t *, const char *, int ) LIBVLC_USED LIBVLC_DEPRECATED;
+VLC_API vlc_object_t *vlc_object_find_name( vlc_object_t *, const char *, int ) VLC_USED VLC_DEPRECATED;
 VLC_API void * vlc_object_hold( vlc_object_t * );
 VLC_API void vlc_object_release( vlc_object_t * );
-VLC_API vlc_list_t *vlc_list_children( vlc_object_t * ) LIBVLC_USED;
+VLC_API vlc_list_t *vlc_list_children( vlc_object_t * ) VLC_USED;
 VLC_API void vlc_list_release( vlc_list_t * );
-VLC_API char *vlc_object_get_name( const vlc_object_t * ) LIBVLC_USED;
+VLC_API char *vlc_object_get_name( const vlc_object_t * ) VLC_USED;
 #define vlc_object_get_name(o) vlc_object_get_name(VLC_OBJECT(o))
 
 /**}@*/
@@ -92,11 +92,11 @@ VLC_API char *vlc_object_get_name( const vlc_object_t * ) LIBVLC_USED;
     vlc_list_children( VLC_OBJECT(a) )
 
 /* Objects and threading */
-VLC_API void vlc_object_kill( vlc_object_t * ) LIBVLC_DEPRECATED;
+VLC_API void vlc_object_kill( vlc_object_t * ) VLC_DEPRECATED;
 #define vlc_object_kill(a) \
     vlc_object_kill( VLC_OBJECT(a) )
 
-LIBVLC_USED
+VLC_USED
 static inline bool vlc_object_alive (const vlc_object_t *obj)
 {
     barrier ();
diff --git a/include/vlc_opengl.h b/include/vlc_opengl.h
index bd9ccf02cc..64e4b7dc58 100644
--- a/include/vlc_opengl.h
+++ b/include/vlc_opengl.h
@@ -56,7 +56,7 @@ enum {
     VLC_OPENGL_ES2,
 };
 
-VLC_API vlc_gl_t *vlc_gl_Create(struct vout_window_t *, unsigned, const char *) LIBVLC_USED;
+VLC_API vlc_gl_t *vlc_gl_Create(struct vout_window_t *, unsigned, const char *) VLC_USED;
 VLC_API void vlc_gl_Destroy(vlc_gl_t *);
 
 static inline int vlc_gl_MakeCurrent(vlc_gl_t *gl)
diff --git a/include/vlc_osd.h b/include/vlc_osd.h
index 0fe9da4748..d6df9440b0 100644
--- a/include/vlc_osd.h
+++ b/include/vlc_osd.h
@@ -264,7 +264,7 @@ struct osd_menu_t
  * functions. It creates the osd_menu object and holds a pointer to it
  * during its lifetime.
  */
-VLC_API osd_menu_t * osd_MenuCreate( vlc_object_t *, const char * ) LIBVLC_USED;
+VLC_API osd_menu_t * osd_MenuCreate( vlc_object_t *, const char * ) VLC_USED;
 
 /**
  * Delete the osd_menu_t object
@@ -282,7 +282,7 @@ VLC_API void osd_MenuDelete( vlc_object_t *, osd_menu_t * );
  * Find OSD Menu button at position x,y
  */
 VLC_API osd_button_t *osd_ButtonFind( vlc_object_t *p_this,
-     int, int, int, int, int, int ) LIBVLC_USED;
+     int, int, int, int, int, int ) VLC_USED;
 
 #define osd_ButtonFind(object,x,y,h,w,sh,sw)  osd_ButtonFind(object,x,y,h,w,sh,sw)
 
@@ -377,7 +377,7 @@ VLC_API void osd_Volume( vlc_object_t * );
  * Retrieve a non modifyable pointer to the OSD Menu state
  *
  */
-LIBVLC_USED
+VLC_USED
 static inline const osd_menu_state_t *osd_GetMenuState( osd_menu_t *p_osd )
 {
     return( p_osd->p_state );
@@ -388,7 +388,7 @@ static inline const osd_menu_state_t *osd_GetMenuState( osd_menu_t *p_osd )
  *
  * Returns 0 when no key has been pressed or the value of the key pressed.
  */
-LIBVLC_USED
+VLC_USED
 static inline bool osd_GetKeyPressed( osd_menu_t *p_osd )
 {
     return( p_osd->p_state->b_update );
@@ -445,7 +445,7 @@ static inline void osd_SetMenuUpdate( osd_menu_t *p_osd, bool b_value )
  */
 VLC_API int osd_ShowTextRelative( spu_t *, int, const char *, const text_style_t *, int, int, int, mtime_t );
 VLC_API int osd_ShowTextAbsolute( spu_t *, int, const char *, const text_style_t *, int, int, int, mtime_t, mtime_t );
-VLC_API void osd_Message( spu_t *, int, char *, ... ) LIBVLC_FORMAT( 3, 4 );
+VLC_API void osd_Message( spu_t *, int, char *, ... ) VLC_FORMAT( 3, 4 );
 
 /** @} */
 
diff --git a/include/vlc_picture.h b/include/vlc_picture.h
index c876f0a51f..f264d760fa 100644
--- a/include/vlc_picture.h
+++ b/include/vlc_picture.h
@@ -114,7 +114,7 @@ struct picture_t
  * with picture_Hold and picture_Release. This default management will release
  * p_sys, p_q, p_data_orig fields if non NULL.
  */
-VLC_API picture_t * picture_New( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den ) LIBVLC_USED;
+VLC_API picture_t * picture_New( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den ) VLC_USED;
 
 /**
  * This function will create a new picture using the given format.
@@ -122,7 +122,7 @@ VLC_API picture_t * picture_New( vlc_fourcc_t i_chroma, int i_width, int i_heigh
  * When possible, it is preferred to use this function over picture_New
  * as more information about the format is kept.
  */
-VLC_API picture_t * picture_NewFromFormat( const video_format_t *p_fmt ) LIBVLC_USED;
+VLC_API picture_t * picture_NewFromFormat( const video_format_t *p_fmt ) VLC_USED;
 
 /**
  * Resource for a picture.
@@ -148,7 +148,7 @@ typedef struct
  *
  * If the resource is NULL then a plain picture_NewFromFormat is returned.
  */
-VLC_API picture_t * picture_NewFromResource( const video_format_t *, const picture_resource_t * ) LIBVLC_USED;
+VLC_API picture_t * picture_NewFromResource( const video_format_t *, const picture_resource_t * ) VLC_USED;
 
 /**
  * This function will force the destruction a picture.
diff --git a/include/vlc_picture_fifo.h b/include/vlc_picture_fifo.h
index 2f47442342..77aaa9e2f5 100644
--- a/include/vlc_picture_fifo.h
+++ b/include/vlc_picture_fifo.h
@@ -41,7 +41,7 @@ typedef struct picture_fifo_t picture_fifo_t;
 /**
  * It creates an empty picture_fifo_t.
  */
-VLC_API picture_fifo_t * picture_fifo_New( void ) LIBVLC_USED;
+VLC_API picture_fifo_t * picture_fifo_New( void ) VLC_USED;
 
 /**
  * It destroys a fifo created by picture_fifo_New.
@@ -55,7 +55,7 @@ VLC_API void picture_fifo_Delete( picture_fifo_t * );
  *
  * If the fifo is empty, it return NULL without waiting.
  */
-VLC_API picture_t * picture_fifo_Pop( picture_fifo_t * ) LIBVLC_USED;
+VLC_API picture_t * picture_fifo_Pop( picture_fifo_t * ) VLC_USED;
 
 /**
  * It returns the first picture_t pointer from the fifo but does not
@@ -64,7 +64,7 @@ VLC_API picture_t * picture_fifo_Pop( picture_fifo_t * ) LIBVLC_USED;
  *
  * If the fifo is empty, it return NULL without waiting.
  */
-VLC_API picture_t * picture_fifo_Peek( picture_fifo_t * ) LIBVLC_USED;
+VLC_API picture_t * picture_fifo_Peek( picture_fifo_t * ) VLC_USED;
 
 /**
  * It saves a picture_t into the fifo.
diff --git a/include/vlc_picture_pool.h b/include/vlc_picture_pool.h
index 0e51dd28a8..7eced8fe35 100644
--- a/include/vlc_picture_pool.h
+++ b/include/vlc_picture_pool.h
@@ -62,21 +62,21 @@ typedef struct {
  * as soon as a picture is unused. They are allowed to modify picture_t::p and
  * access picture_t::p_sys.
  */
-VLC_API picture_pool_t * picture_pool_NewExtended( const picture_pool_configuration_t * ) LIBVLC_USED;
+VLC_API picture_pool_t * picture_pool_NewExtended( const picture_pool_configuration_t * ) VLC_USED;
 
 /**
  * It creates a picture_pool_t wrapping the given arrays of picture.
  *
  * It is provided as convenience.
  */
-VLC_API picture_pool_t * picture_pool_New( int picture_count, picture_t *picture[] ) LIBVLC_USED;
+VLC_API picture_pool_t * picture_pool_New( int picture_count, picture_t *picture[] ) VLC_USED;
 
 /**
  * It creates a picture_pool_t creating images using the given format.
  *
  * Provided for convenience.
  */
-VLC_API picture_pool_t * picture_pool_NewFromFormat( const video_format_t *, int picture_count ) LIBVLC_USED;
+VLC_API picture_pool_t * picture_pool_NewFromFormat( const video_format_t *, int picture_count ) VLC_USED;
 
 /**
  * It destroys a pool created by picture_pool_New.
@@ -91,7 +91,7 @@ VLC_API void picture_pool_Delete( picture_pool_t * );
  *
  * The picture must be release by using picture_Release.
  */
-VLC_API picture_t * picture_pool_Get( picture_pool_t * ) LIBVLC_USED;
+VLC_API picture_t * picture_pool_Get( picture_pool_t * ) VLC_USED;
 
 /**
  * It forces the next picture_pool_Get to return a picture even if no
@@ -114,7 +114,7 @@ VLC_API void picture_pool_NonEmpty( picture_pool_t *, bool reset );
  * The returned pool must be deleted before the master pool.
  * When deleted, all pictures return to the master pool.
  */
-VLC_API picture_pool_t * picture_pool_Reserve(picture_pool_t *, int picture_count) LIBVLC_USED;
+VLC_API picture_pool_t * picture_pool_Reserve(picture_pool_t *, int picture_count) VLC_USED;
 
 /**
  * It returns the size of the given pool.
diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index b49a0d8e4b..8674f553a9 100644
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -250,7 +250,7 @@ enum pl_locked_state
 #define PL_UNLOCK playlist_Unlock( p_playlist )
 #define PL_ASSERT_LOCKED playlist_AssertLocked( p_playlist )
 
-VLC_API playlist_t * pl_Get( vlc_object_t * ) LIBVLC_USED;
+VLC_API playlist_t * pl_Get( vlc_object_t * ) VLC_USED;
 #define pl_Get( a ) pl_Get( VLC_OBJECT(a) )
 
 /* Playlist control */
@@ -279,7 +279,7 @@ VLC_API int playlist_Control( playlist_t *p_playlist, int i_query, bool b_locked
 
 /** Get current playing input. The object is retained.
  */
-VLC_API input_thread_t * playlist_CurrentInput( playlist_t *p_playlist ) LIBVLC_USED;
+VLC_API input_thread_t * playlist_CurrentInput( playlist_t *p_playlist ) VLC_USED;
 
 /** Clear the playlist
  * \param b_locked TRUE if playlist is locked when entering this function
@@ -297,7 +297,7 @@ VLC_API int playlist_TreeMove( playlist_t *, playlist_item_t *, playlist_item_t
 VLC_API int playlist_TreeMoveMany( playlist_t *, int, playlist_item_t **, playlist_item_t *, int );
 VLC_API int playlist_RecursiveNodeSort( playlist_t *, playlist_item_t *,int, int );
 
-VLC_API playlist_item_t * playlist_CurrentPlayingItem( playlist_t * ) LIBVLC_USED;
+VLC_API playlist_item_t * playlist_CurrentPlayingItem( playlist_t * ) VLC_USED;
 VLC_API int playlist_Status( playlist_t * );
 
 /**
@@ -343,8 +343,8 @@ VLC_API playlist_item_t * playlist_NodeAddInput( playlist_t *, input_item_t *, p
 VLC_API int playlist_NodeAddCopy( playlist_t *, playlist_item_t *, playlist_item_t *, int );
 
 /********************************** Item search *************************/
-VLC_API playlist_item_t * playlist_ItemGetById(playlist_t *, int ) LIBVLC_USED;
-VLC_API playlist_item_t * playlist_ItemGetByInput(playlist_t *,input_item_t * ) LIBVLC_USED;
+VLC_API playlist_item_t * playlist_ItemGetById(playlist_t *, int ) VLC_USED;
+VLC_API playlist_item_t * playlist_ItemGetByInput(playlist_t *,input_item_t * ) VLC_USED;
 
 VLC_API int playlist_LiveSearchUpdate(playlist_t *, playlist_item_t *, const char *, bool );
 
@@ -356,11 +356,11 @@ VLC_API playlist_item_t * playlist_NodeCreate( playlist_t *, const char *, playl
 VLC_API int playlist_NodeAppend(playlist_t *,playlist_item_t*,playlist_item_t *);
 VLC_API int playlist_NodeInsert(playlist_t *,playlist_item_t*,playlist_item_t *, int);
 VLC_API int playlist_NodeRemoveItem(playlist_t *,playlist_item_t*,playlist_item_t *);
-VLC_API playlist_item_t * playlist_ChildSearchName(playlist_item_t*, const char* ) LIBVLC_USED;
+VLC_API playlist_item_t * playlist_ChildSearchName(playlist_item_t*, const char* ) VLC_USED;
 VLC_API int playlist_NodeDelete( playlist_t *, playlist_item_t *, bool , bool );
 
-VLC_API playlist_item_t * playlist_GetNextLeaf( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, bool b_ena, bool b_unplayed ) LIBVLC_USED;
-VLC_API playlist_item_t * playlist_GetPrevLeaf( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, bool b_ena, bool b_unplayed ) LIBVLC_USED;
+VLC_API playlist_item_t * playlist_GetNextLeaf( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, bool b_ena, bool b_unplayed ) VLC_USED;
+VLC_API playlist_item_t * playlist_GetPrevLeaf( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, bool b_ena, bool b_unplayed ) VLC_USED;
 
 /***********************************************************************
  * Inline functions
diff --git a/include/vlc_rand.h b/include/vlc_rand.h
index 875752e01e..4c738a0b61 100644
--- a/include/vlc_rand.h
+++ b/include/vlc_rand.h
@@ -30,8 +30,8 @@
 VLC_API void vlc_rand_bytes(void *buf, size_t len);
 
 /* Interlocked (but not reproducible) functions for the POSIX PRNG */
-VLC_API double vlc_drand48(void) LIBVLC_USED;
-VLC_API long vlc_lrand48(void) LIBVLC_USED;
-VLC_API long vlc_mrand48(void) LIBVLC_USED;
+VLC_API double vlc_drand48(void) VLC_USED;
+VLC_API long vlc_lrand48(void) VLC_USED;
+VLC_API long vlc_mrand48(void) VLC_USED;
 
 #endif
diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h
index 75eaf343bc..69c3d96bd5 100644
--- a/include/vlc_services_discovery.h
+++ b/include/vlc_services_discovery.h
@@ -127,12 +127,12 @@ static inline int vlc_sd_control( services_discovery_t *p_sd, int i_control, va_
 
 /* Get the services discovery modules names to use in Create(), in a null
  * terminated string array. Array and string must be freed after use. */
-VLC_API char ** vlc_sd_GetNames( vlc_object_t *, char ***, int ** ) LIBVLC_USED;
+VLC_API char ** vlc_sd_GetNames( vlc_object_t *, char ***, int ** ) VLC_USED;
 #define vlc_sd_GetNames(obj, pln, pcat ) \
         vlc_sd_GetNames(VLC_OBJECT(obj), pln, pcat)
 
 /* Creation of a services_discovery object */
-VLC_API services_discovery_t * vlc_sd_Create( vlc_object_t *, const char * ) LIBVLC_USED;
+VLC_API services_discovery_t * vlc_sd_Create( vlc_object_t *, const char * ) VLC_USED;
 VLC_API bool vlc_sd_Start( services_discovery_t * );
 VLC_API void vlc_sd_Stop( services_discovery_t * );
 VLC_API void vlc_sd_Destroy( services_discovery_t * );
@@ -147,10 +147,10 @@ static inline void vlc_sd_StopAndDestroy( services_discovery_t * p_this )
 }
 
 /* Read info from discovery object */
-VLC_API char * services_discovery_GetLocalizedName( services_discovery_t * p_this ) LIBVLC_USED;
+VLC_API char * services_discovery_GetLocalizedName( services_discovery_t * p_this ) VLC_USED;
 
 /* Receive event notification (preferred way to get new items) */
-VLC_API vlc_event_manager_t * services_discovery_EventManager( services_discovery_t * p_this ) LIBVLC_USED;
+VLC_API vlc_event_manager_t * services_discovery_EventManager( services_discovery_t * p_this ) VLC_USED;
 
 /* Used by services_discovery to post update about their items */
     /* About the psz_category, it is a legacy way to add info to the item,
diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 892761b0e6..54f696593c 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -91,7 +91,7 @@ enum access_out_query_e
     ACCESS_OUT_CONTROLS_PACE, /* arg1=bool *, can fail (assume true) */
 };
 
-VLC_API sout_access_out_t * sout_AccessOutNew( vlc_object_t *, const char *psz_access, const char *psz_name ) LIBVLC_USED;
+VLC_API sout_access_out_t * sout_AccessOutNew( vlc_object_t *, const char *psz_access, const char *psz_name ) VLC_USED;
 #define sout_AccessOutNew( obj, access, name ) \
         sout_AccessOutNew( VLC_OBJECT(obj), access, name )
 VLC_API void sout_AccessOutDelete( sout_access_out_t * );
@@ -162,8 +162,8 @@ struct sout_input_t
 };
 
 
-VLC_API sout_mux_t * sout_MuxNew( sout_instance_t*, const char *, sout_access_out_t * ) LIBVLC_USED;
-VLC_API sout_input_t * sout_MuxAddStream( sout_mux_t *, es_format_t * ) LIBVLC_USED;
+VLC_API sout_mux_t * sout_MuxNew( sout_instance_t*, const char *, sout_access_out_t * ) VLC_USED;
+VLC_API sout_input_t * sout_MuxAddStream( sout_mux_t *, es_format_t * ) VLC_USED;
 VLC_API void sout_MuxDeleteStream( sout_mux_t *, sout_input_t * );
 VLC_API void sout_MuxDelete( sout_mux_t * );
 VLC_API void sout_MuxSendBuffer( sout_mux_t *, sout_input_t  *, block_t * );
@@ -209,7 +209,7 @@ struct sout_stream_t
 
 VLC_API void sout_StreamChainDelete(sout_stream_t *p_first, sout_stream_t *p_last );
 VLC_API sout_stream_t *sout_StreamChainNew(sout_instance_t *p_sout,
-        char *psz_chain, sout_stream_t *p_next, sout_stream_t **p_last) LIBVLC_USED;
+        char *psz_chain, sout_stream_t *p_next, sout_stream_t **p_last) VLC_USED;
 
 static inline sout_stream_id_t *sout_StreamIdAdd( sout_stream_t *s, es_format_t *fmt )
 {
@@ -234,7 +234,7 @@ VLC_API encoder_t * sout_EncoderCreate( vlc_object_t *obj );
 /****************************************************************************
  * Announce handler
  ****************************************************************************/
-VLC_API session_descriptor_t* sout_AnnounceRegisterSDP( vlc_object_t *, const char *, const char * ) LIBVLC_USED;
+VLC_API session_descriptor_t* sout_AnnounceRegisterSDP( vlc_object_t *, const char *, const char * ) VLC_USED;
 VLC_API int sout_AnnounceUnRegister(vlc_object_t *,session_descriptor_t* );
 #define sout_AnnounceRegisterSDP(o, sdp, addr) \
         sout_AnnounceRegisterSDP(VLC_OBJECT (o), sdp, addr)
@@ -245,9 +245,9 @@ VLC_API int sout_AnnounceUnRegister(vlc_object_t *,session_descriptor_t* );
 
 struct sockaddr;
 
-VLC_API char * vlc_sdp_Start( vlc_object_t *obj, const char *cfgpref, const struct sockaddr *src, size_t srclen, const struct sockaddr *addr, size_t addrlen ) LIBVLC_USED;
+VLC_API char * vlc_sdp_Start( vlc_object_t *obj, const char *cfgpref, const struct sockaddr *src, size_t srclen, const struct sockaddr *addr, size_t addrlen ) VLC_USED;
 VLC_API char * sdp_AddMedia(char **sdp, const char *type, const char *protocol, int dport, unsigned pt, bool bw_indep, unsigned bw, const char *ptname, unsigned clockrate, unsigned channels, const char *fmtp);
-VLC_API char * sdp_AddAttribute(char **sdp, const char *name, const char *fmt, ...) LIBVLC_FORMAT( 3, 4 );
+VLC_API char * sdp_AddAttribute(char **sdp, const char *name, const char *fmt, ...) VLC_FORMAT( 3, 4 );
 
 /** Description module */
 typedef struct sout_description_data_t
diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 630e642d97..2ee0e368ca 100644
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -171,7 +171,7 @@ VLC_API void vlc_mutex_init( vlc_mutex_t * );
 VLC_API void vlc_mutex_init_recursive( vlc_mutex_t * );
 VLC_API void vlc_mutex_destroy( vlc_mutex_t * );
 VLC_API void vlc_mutex_lock( vlc_mutex_t * );
-VLC_API int vlc_mutex_trylock( vlc_mutex_t * ) LIBVLC_USED;
+VLC_API int vlc_mutex_trylock( vlc_mutex_t * ) VLC_USED;
 VLC_API void vlc_mutex_unlock( vlc_mutex_t * );
 VLC_API void vlc_cond_init( vlc_cond_t * );
 VLC_API void vlc_cond_init_daytime( vlc_cond_t * );
@@ -194,19 +194,19 @@ VLC_API int vlc_threadvar_create(vlc_threadvar_t * , void (*) (void *) );
 VLC_API void vlc_threadvar_delete(vlc_threadvar_t *);
 VLC_API int vlc_threadvar_set(vlc_threadvar_t, void *);
 VLC_API void * vlc_threadvar_get(vlc_threadvar_t);
-VLC_API int vlc_thread_create( vlc_object_t *, void * ( * ) ( vlc_object_t * ), int ) LIBVLC_USED LIBVLC_DEPRECATED;
-VLC_API int vlc_thread_set_priority( vlc_object_t *, int ) LIBVLC_DEPRECATED;
-VLC_API void vlc_thread_join( vlc_object_t * ) LIBVLC_DEPRECATED;
+VLC_API int vlc_thread_create( vlc_object_t *, void * ( * ) ( vlc_object_t * ), int ) VLC_USED VLC_DEPRECATED;
+VLC_API int vlc_thread_set_priority( vlc_object_t *, int ) VLC_DEPRECATED;
+VLC_API void vlc_thread_join( vlc_object_t * ) VLC_DEPRECATED;
 
-VLC_API int vlc_clone(vlc_thread_t *, void * (*) (void *), void *, int) LIBVLC_USED;
+VLC_API int vlc_clone(vlc_thread_t *, void * (*) (void *), void *, int) VLC_USED;
 VLC_API void vlc_cancel(vlc_thread_t);
 VLC_API void vlc_join(vlc_thread_t, void **);
 VLC_API void vlc_control_cancel (int cmd, ...);
 
-VLC_API int vlc_timer_create(vlc_timer_t *, void (*) (void *), void *) LIBVLC_USED;
+VLC_API int vlc_timer_create(vlc_timer_t *, void (*) (void *), void *) VLC_USED;
 VLC_API void vlc_timer_destroy(vlc_timer_t);
 VLC_API void vlc_timer_schedule(vlc_timer_t, bool, mtime_t, mtime_t);
-VLC_API unsigned vlc_timer_getoverrun(vlc_timer_t) LIBVLC_USED;
+VLC_API unsigned vlc_timer_getoverrun(vlc_timer_t) VLC_USED;
 
 #ifndef LIBVLC_USE_PTHREAD_CANCEL
 enum {
diff --git a/include/vlc_variables.h b/include/vlc_variables.h
index 533be47bc9..8faea3f34b 100644
--- a/include/vlc_variables.h
+++ b/include/vlc_variables.h
@@ -137,7 +137,7 @@ VLC_API int var_Destroy( vlc_object_t *, const char * );
 VLC_API int var_Change( vlc_object_t *, const char *, int, vlc_value_t *, vlc_value_t * );
 #define var_Change(a,b,c,d,e) var_Change( VLC_OBJECT(a), b, c, d, e )
 
-VLC_API int var_Type( vlc_object_t *, const char * ) LIBVLC_USED;
+VLC_API int var_Type( vlc_object_t *, const char * ) VLC_USED;
 #define var_Type(a,b) var_Type( VLC_OBJECT(a), b )
 
 VLC_API int var_Set( vlc_object_t *, const char *, vlc_value_t );
@@ -291,7 +291,7 @@ int var_SetAddress( vlc_object_t *p_obj, const char *psz_name, void *ptr )
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline int64_t var_GetInteger( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t val;
@@ -307,7 +307,7 @@ static inline int64_t var_GetInteger( vlc_object_t *p_obj, const char *psz_name
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline bool var_GetBool( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t val; val.b_bool = false;
@@ -324,7 +324,7 @@ static inline bool var_GetBool( vlc_object_t *p_obj, const char *psz_name )
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline int64_t var_GetTime( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t val; val.i_time = 0L;
@@ -355,7 +355,7 @@ static inline void var_GetCoords( vlc_object_t *obj, const char *name,
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline float var_GetFloat( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t val; val.f_float = 0.0;
@@ -371,7 +371,7 @@ static inline float var_GetFloat( vlc_object_t *p_obj, const char *psz_name )
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED LIBVLC_MALLOC
+VLC_USED VLC_MALLOC
 static inline char *var_GetString( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t val; val.psz_string = NULL;
@@ -381,7 +381,7 @@ static inline char *var_GetString( vlc_object_t *p_obj, const char *psz_name )
         return val.psz_string;
 }
 
-LIBVLC_USED LIBVLC_MALLOC
+VLC_USED VLC_MALLOC
 static inline char *var_GetNonEmptyString( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t val;
@@ -393,7 +393,7 @@ static inline char *var_GetNonEmptyString( vlc_object_t *p_obj, const char *psz_
     return NULL;
 }
 
-LIBVLC_USED
+VLC_USED
 static inline void *var_GetAddress( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t val;
@@ -457,7 +457,7 @@ static inline uint64_t var_NAndInteger( vlc_object_t *obj, const char *name,
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline int64_t var_CreateGetInteger( vlc_object_t *p_obj, const char *psz_name )
 {
     var_Create( p_obj, psz_name, VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
@@ -470,7 +470,7 @@ static inline int64_t var_CreateGetInteger( vlc_object_t *p_obj, const char *psz
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline bool var_CreateGetBool( vlc_object_t *p_obj, const char *psz_name )
 {
     var_Create( p_obj, psz_name, VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
@@ -483,7 +483,7 @@ static inline bool var_CreateGetBool( vlc_object_t *p_obj, const char *psz_name
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline int64_t var_CreateGetTime( vlc_object_t *p_obj, const char *psz_name )
 {
     var_Create( p_obj, psz_name, VLC_VAR_TIME | VLC_VAR_DOINHERIT );
@@ -496,7 +496,7 @@ static inline int64_t var_CreateGetTime( vlc_object_t *p_obj, const char *psz_na
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline float var_CreateGetFloat( vlc_object_t *p_obj, const char *psz_name )
 {
     var_Create( p_obj, psz_name, VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
@@ -509,7 +509,7 @@ static inline float var_CreateGetFloat( vlc_object_t *p_obj, const char *psz_nam
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED LIBVLC_MALLOC
+VLC_USED VLC_MALLOC
 static inline char *var_CreateGetString( vlc_object_t *p_obj,
                                            const char *psz_name )
 {
@@ -517,7 +517,7 @@ static inline char *var_CreateGetString( vlc_object_t *p_obj,
     return var_GetString( p_obj, psz_name );
 }
 
-LIBVLC_USED LIBVLC_MALLOC
+VLC_USED VLC_MALLOC
 static inline char *var_CreateGetNonEmptyString( vlc_object_t *p_obj,
                                                    const char *psz_name )
 {
@@ -531,7 +531,7 @@ static inline char *var_CreateGetNonEmptyString( vlc_object_t *p_obj,
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline void *var_CreateGetAddress( vlc_object_t *p_obj,
                                            const char *psz_name )
 {
@@ -553,7 +553,7 @@ static inline void *var_CreateGetAddress( vlc_object_t *p_obj,
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline int64_t var_CreateGetIntegerCommand( vlc_object_t *p_obj, const char *psz_name )
 {
     var_Create( p_obj, psz_name, VLC_VAR_INTEGER | VLC_VAR_DOINHERIT
@@ -567,7 +567,7 @@ static inline int64_t var_CreateGetIntegerCommand( vlc_object_t *p_obj, const ch
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline bool var_CreateGetBoolCommand( vlc_object_t *p_obj, const char *psz_name )
 {
     var_Create( p_obj, psz_name, VLC_VAR_BOOL | VLC_VAR_DOINHERIT
@@ -581,7 +581,7 @@ static inline bool var_CreateGetBoolCommand( vlc_object_t *p_obj, const char *ps
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline int64_t var_CreateGetTimeCommand( vlc_object_t *p_obj, const char *psz_name )
 {
     var_Create( p_obj, psz_name, VLC_VAR_TIME | VLC_VAR_DOINHERIT
@@ -595,7 +595,7 @@ static inline int64_t var_CreateGetTimeCommand( vlc_object_t *p_obj, const char
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED
+VLC_USED
 static inline float var_CreateGetFloatCommand( vlc_object_t *p_obj, const char *psz_name )
 {
     var_Create( p_obj, psz_name, VLC_VAR_FLOAT | VLC_VAR_DOINHERIT
@@ -609,7 +609,7 @@ static inline float var_CreateGetFloatCommand( vlc_object_t *p_obj, const char *
  * \param p_obj The object that holds the variable
  * \param psz_name The name of the variable
  */
-LIBVLC_USED LIBVLC_MALLOC
+VLC_USED VLC_MALLOC
 static inline char *var_CreateGetStringCommand( vlc_object_t *p_obj,
                                            const char *psz_name )
 {
@@ -618,7 +618,7 @@ static inline char *var_CreateGetStringCommand( vlc_object_t *p_obj,
     return var_GetString( p_obj, psz_name );
 }
 
-LIBVLC_USED LIBVLC_MALLOC
+VLC_USED VLC_MALLOC
 static inline char *var_CreateGetNonEmptyStringCommand( vlc_object_t *p_obj,
                                                    const char *psz_name )
 {
@@ -634,7 +634,7 @@ static inline char *var_CreateGetNonEmptyStringCommand( vlc_object_t *p_obj,
 #define var_CreateGetStringCommand(a,b)   var_CreateGetStringCommand( VLC_OBJECT(a),b)
 #define var_CreateGetNonEmptyStringCommand(a,b)   var_CreateGetNonEmptyStringCommand( VLC_OBJECT(a),b)
 
-LIBVLC_USED
+VLC_USED
 static inline int var_CountChoices( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t count;
@@ -654,7 +654,7 @@ static inline bool var_ToggleBool( vlc_object_t *p_obj, const char *psz_name )
 #define var_ToggleBool(a,b) var_ToggleBool( VLC_OBJECT(a),b )
 
 
-LIBVLC_USED
+VLC_USED
 static inline bool var_InheritBool( vlc_object_t *obj, const char *name )
 {
     vlc_value_t val;
@@ -665,7 +665,7 @@ static inline bool var_InheritBool( vlc_object_t *obj, const char *name )
 }
 #define var_InheritBool(o, n) var_InheritBool(VLC_OBJECT(o), n)
 
-LIBVLC_USED
+VLC_USED
 static inline int64_t var_InheritInteger( vlc_object_t *obj, const char *name )
 {
     vlc_value_t val;
@@ -676,7 +676,7 @@ static inline int64_t var_InheritInteger( vlc_object_t *obj, const char *name )
 }
 #define var_InheritInteger(o, n) var_InheritInteger(VLC_OBJECT(o), n)
 
-LIBVLC_USED
+VLC_USED
 static inline float var_InheritFloat( vlc_object_t *obj, const char *name )
 {
     vlc_value_t val;
@@ -687,7 +687,7 @@ static inline float var_InheritFloat( vlc_object_t *obj, const char *name )
 }
 #define var_InheritFloat(o, n) var_InheritFloat(VLC_OBJECT(o), n)
 
-LIBVLC_USED LIBVLC_MALLOC
+VLC_USED VLC_MALLOC
 static inline char *var_InheritString( vlc_object_t *obj, const char *name )
 {
     vlc_value_t val;
@@ -703,7 +703,7 @@ static inline char *var_InheritString( vlc_object_t *obj, const char *name )
 }
 #define var_InheritString(o, n) var_InheritString(VLC_OBJECT(o), n)
 
-LIBVLC_USED
+VLC_USED
 static inline mtime_t var_InheritTime( vlc_object_t *obj, const char *name )
 {
     vlc_value_t val;
@@ -714,7 +714,7 @@ static inline mtime_t var_InheritTime( vlc_object_t *obj, const char *name )
 }
 #define var_InheritTime(o, n) var_InheritTime(VLC_OBJECT(o), n)
 
-LIBVLC_USED
+VLC_USED
 static inline void *var_InheritAddress( vlc_object_t *obj, const char *name )
 {
     vlc_value_t val;
diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h
index 501b4a2057..6c9087685a 100644
--- a/include/vlc_vlm.h
+++ b/include/vlc_vlm.h
@@ -191,7 +191,7 @@ VLC_API int vlm_ExecuteCommand( vlm_t *, const char *, vlm_message_t ** );
 VLC_API int vlm_Control( vlm_t *p_vlm, int i_query, ... );
 
 VLC_API vlm_message_t * vlm_MessageSimpleNew( const char * );
-VLC_API vlm_message_t * vlm_MessageNew( const char *, const char *, ... ) LIBVLC_FORMAT( 2, 3 );
+VLC_API vlm_message_t * vlm_MessageNew( const char *, const char *, ... ) VLC_FORMAT( 2, 3 );
 VLC_API vlm_message_t * vlm_MessageAdd( vlm_message_t *, vlm_message_t * );
 VLC_API void vlm_MessageDelete( vlm_message_t * );
 
diff --git a/include/vlc_vout_osd.h b/include/vlc_vout_osd.h
index b8e5a9c2e4..d587654c72 100644
--- a/include/vlc_vout_osd.h
+++ b/include/vlc_vout_osd.h
@@ -71,7 +71,7 @@ VLC_API void vout_OSDText( vout_thread_t *vout, int channel, int position, mtime
  *
  * Provided for convenience.
  */
-VLC_API void vout_OSDMessage( vout_thread_t *, int, const char *, ... ) LIBVLC_FORMAT( 3, 4 );
+VLC_API void vout_OSDMessage( vout_thread_t *, int, const char *, ... ) VLC_FORMAT( 3, 4 );
 
 /**
  * Display a slider on the video output.
diff --git a/include/vlc_xml.h b/include/vlc_xml.h
index 57714d0e6d..df11ba5ee0 100644
--- a/include/vlc_xml.h
+++ b/include/vlc_xml.h
@@ -46,7 +46,7 @@ struct xml_t
                             const char * );
 };
 
-VLC_API xml_t * xml_Create( vlc_object_t * ) LIBVLC_USED;
+VLC_API xml_t * xml_Create( vlc_object_t * ) VLC_USED;
 #define xml_Create( a ) xml_Create( VLC_OBJECT(a) )
 VLC_API void xml_Delete( xml_t * );
 
@@ -76,10 +76,10 @@ struct xml_reader_t
     int (*pf_use_dtd) ( xml_reader_t * );
 };
 
-VLC_API xml_reader_t * xml_ReaderCreate(vlc_object_t *, stream_t *) LIBVLC_USED;
+VLC_API xml_reader_t * xml_ReaderCreate(vlc_object_t *, stream_t *) VLC_USED;
 #define xml_ReaderCreate( a, s ) xml_ReaderCreate(VLC_OBJECT(a), s)
 VLC_API void xml_ReaderDelete(xml_reader_t *);
-VLC_API xml_reader_t * xml_ReaderReset(xml_reader_t *, stream_t *) LIBVLC_USED;
+VLC_API xml_reader_t * xml_ReaderReset(xml_reader_t *, stream_t *) VLC_USED;
 
 static inline int xml_ReaderNextNode( xml_reader_t *reader, const char **pval )
 {
diff --git a/modules/control/rc.c b/modules/control/rc.c
index ce59f87e4d..d91433c0b1 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -138,7 +138,7 @@ struct intf_sys_t
 
 #define msg_rc( ... ) __msg_rc( p_intf, __VA_ARGS__ )
 
-LIBVLC_FORMAT(2, 3)
+VLC_FORMAT(2, 3)
 static void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
 {
     va_list args;
diff --git a/src/input/decoder.h b/src/input/decoder.h
index 8d0a66c994..435afdcca6 100644
--- a/src/input/decoder.h
+++ b/src/input/decoder.h
@@ -31,7 +31,7 @@
 #define BLOCK_FLAG_CORE_FLUSH (1 <<BLOCK_FLAG_CORE_PRIVATE_SHIFT)
 
 decoder_t *input_DecoderNew( input_thread_t *, es_format_t *, input_clock_t *,
-                             sout_instance_t * ) LIBVLC_USED;
+                             sout_instance_t * ) VLC_USED;
 
 /**
  * This function changes the pause state.