diff --git a/modules/demux/mock.c b/modules/demux/mock.c
index 2726c18f9a..fe13b0f79a 100644
--- a/modules/demux/mock.c
+++ b/modules/demux/mock.c
@@ -799,8 +799,8 @@ CreateSubBlock(demux_t *demux, struct mock_track *track)
     b->i_buffer = len;
 
     free(text);
-    return b;
     (void) track;
+    return b;
 }
 
 static int
diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c
index 72dd8feb8b..61a4474a69 100644
--- a/modules/stream_out/chromaprint.c
+++ b/modules/stream_out/chromaprint.c
@@ -203,8 +203,8 @@ Add( sout_stream_t *p_stream, const es_format_t *p_fmt, const char *es_id )
 
 error:
     free( id );
-    return NULL;
     (void)es_id;
+    return NULL;
 }
 
 static void Del( sout_stream_t *p_stream, void *id )
diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c
index 42e15f3391..f9b25ce132 100644
--- a/modules/stream_out/duplicate.c
+++ b/modules/stream_out/duplicate.c
@@ -199,8 +199,8 @@ static int Control( sout_stream_t *p_stream, int i_query, va_list args )
         }
     }
 
-    return VLC_EGENERIC;
     (void)p_stream;
+    return VLC_EGENERIC;
 }
 
 /*****************************************************************************
@@ -467,8 +467,8 @@ static int Send( sout_stream_t *p_stream, void *_id, vlc_frame_t *frame )
         sout_StreamIdSend( dup_id->stream_owner, dup_id->id, to_send );
     }
 
-    return VLC_SUCCESS;
     (void)p_stream;
+    return VLC_SUCCESS;
 }
 
 static void SetPCR( sout_stream_t *stream, vlc_tick_t pcr )
diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c
index bb8a98031c..4d9fdc4acb 100644
--- a/modules/stream_out/es.c
+++ b/modules/stream_out/es.c
@@ -241,8 +241,8 @@ Add( sout_stream_t *p_stream, const es_format_t *p_fmt, const char *es_id )
     }
 
     p_sys->count_sync += id->synchronous;
-    return id;
     (void)es_id;
+    return id;
 }
 
 static void Del( sout_stream_t *p_stream, void *_id )
diff --git a/modules/stream_out/hls/subtitles_segmenter.c b/modules/stream_out/hls/subtitles_segmenter.c
index 65cd956d34..28f84cefa0 100644
--- a/modules/stream_out/hls/subtitles_segmenter.c
+++ b/modules/stream_out/hls/subtitles_segmenter.c
@@ -291,8 +291,8 @@ static int hls_sub_segmenter_Control(sout_mux_t *mux, int query, va_list args)
         return VLC_ENOTSUP;
 
     *(va_arg(args, bool *)) = false;
-    return VLC_SUCCESS;
     (void)mux;
+    return VLC_SUCCESS;
 }
 
 sout_mux_t *CreateSubtitleSegmenter(sout_access_out_t *access,
diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index 59a9cbe352..c6045fb58d 100644
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -273,8 +273,8 @@ Add( sout_stream_t *p_stream, const es_format_t *p_fmt, const char *es_id )
 
     msg_Dbg( p_stream, "mosaic bridge id=%s pos=%d", p_es->psz_id, i );
 
-    return p_owner;
     (void)es_id;
+    return p_owner;
 }
 
 static void Del( sout_stream_t *p_stream, void *id )
diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c
index 422f8e87ee..46c1ab5d7d 100644
--- a/modules/stream_out/smem.c
+++ b/modules/stream_out/smem.c
@@ -289,8 +289,8 @@ Add(sout_stream_t *p_stream, const es_format_t *p_fmt, const char *es_id)
         id = AddVideo( p_stream, p_fmt );
     else if ( p_fmt->i_cat == AUDIO_ES )
         id = AddAudio( p_stream, p_fmt );
-    return id;
     (void)es_id;
+    return id;
 }
 
 static void *AddVideo( sout_stream_t *p_stream, const es_format_t *p_fmt )
diff --git a/modules/stream_out/stats.c b/modules/stream_out/stats.c
index 44ab908e65..ed032d2599 100644
--- a/modules/stream_out/stats.c
+++ b/modules/stream_out/stats.c
@@ -88,8 +88,8 @@ Add( sout_stream_t *p_stream, const es_format_t *p_fmt, const char *es_id )
     vlc_hash_md5_Init( &id->hash );
 
     msg_Dbg( p_stream, "%s: Adding track type:%s id:%d", p_sys->prefix, id->type, id->id);
-    return id;
     (void)es_id;
+    return id;
 }
 
 static void Del( sout_stream_t *p_stream, void *_id )
diff --git a/src/player/aout.c b/src/player/aout.c
index 8674cc6535..ab4fd82618 100644
--- a/src/player/aout.c
+++ b/src/player/aout.c
@@ -115,8 +115,8 @@ vlc_player_AoutCallback(vlc_object_t *this, const char *var,
     else
         vlc_assert_unreachable();
 
-    return VLC_SUCCESS;
     (void) this;
+    return VLC_SUCCESS;
 }
 
 float
diff --git a/src/player/player.c b/src/player/player.c
index 2c8f311eeb..48130f1ea4 100644
--- a/src/player/player.c
+++ b/src/player/player.c
@@ -1907,8 +1907,8 @@ vlc_player_CorkCallback(vlc_object_t *this, const char *var,
 
     vlc_player_Unlock(player);
 
-    return VLC_SUCCESS;
     (void) this; (void) var;
+    return VLC_SUCCESS;
 }
 
 vlc_object_t *