diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index 0f5fff8005..4b4bf1d48c 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -275,7 +275,6 @@ static void init_physical_format(struct ao *ao)
 
 coreaudio_error:
     talloc_free(tmp);
-    return;
 }
 
 static bool init_audiounit(struct ao *ao, AudioStreamBasicDescription asbd, AudioChannelLayout *layout, size_t layout_size)
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c
index 2f050212e0..b32e4816d8 100644
--- a/audio/out/ao_wasapi_utils.c
+++ b/audio/out/ao_wasapi_utils.c
@@ -643,7 +643,6 @@ exit_label:
     SAFE_RELEASE(state->pSessionControl);
     MP_WARN(state, "Error setting audio session name: %s\n",
             mp_HRESULT_to_str(hr));
-    return;
 }
 
 static void init_volume_control(struct wasapi_state *state)
diff --git a/filters/f_hwtransfer.c b/filters/f_hwtransfer.c
index cf8c08ebc4..61141d56c1 100644
--- a/filters/f_hwtransfer.c
+++ b/filters/f_hwtransfer.c
@@ -654,7 +654,6 @@ static void hwdownload_process(struct mp_filter *f)
 
 passthrough:
     mp_pin_in_write(f->ppins[1], frame);
-    return;
 }
 
 static const struct mp_filter_info hwdownload_filter = {
diff --git a/filters/f_lavfi.c b/filters/f_lavfi.c
index d983b281ad..29cb9fa337 100644
--- a/filters/f_lavfi.c
+++ b/filters/f_lavfi.c
@@ -311,7 +311,6 @@ static void precreate_graph(struct lavfi *c, bool first_init)
 error:
     free_graph(c);
     c->failed = true;
-    return;
 }
 
 // Ensure to send EOF to each input pad, so the graph can be drained properly.
diff --git a/filters/f_swscale.c b/filters/f_swscale.c
index 8e684d5507..572073ed6c 100644
--- a/filters/f_swscale.c
+++ b/filters/f_swscale.c
@@ -125,7 +125,6 @@ static void sws_process(struct mp_filter *f)
 error:
     mp_frame_unref(&frame);
     mp_filter_internal_mark_failed(f);
-    return;
 }
 
 static const struct mp_filter_info sws_filter = {
diff --git a/player/clipboard/clipboard-wayland.c b/player/clipboard/clipboard-wayland.c
index 9f53806fc8..48c4f01111 100644
--- a/player/clipboard/clipboard-wayland.c
+++ b/player/clipboard/clipboard-wayland.c
@@ -79,7 +79,6 @@ static void remove_seat(struct clipboard_wayland_seat *seat)
         ext_data_control_source_v1_destroy(seat->primary_selection_source);
     wl_seat_destroy(seat->seat);
     talloc_free(seat);
-    return;
 }
 
 static void destroy_offer(struct clipboard_wayland_data_offer *o)
diff --git a/sub/filter_sdh.c b/sub/filter_sdh.c
index 2c20f77e59..b71c193299 100644
--- a/sub/filter_sdh.c
+++ b/sub/filter_sdh.c
@@ -130,8 +130,6 @@ static void copy_ass(struct sd_filter *sd, char **rpp, struct buffer *buf)
         }
     }
     *rpp = rp;
-
-    return;
 }
 
 static bool skip_enclosed(struct sd_filter *sd, char **rpp, struct buffer *buf,
@@ -219,8 +217,6 @@ static void skip_speaker_label(struct sd_filter *sd, char **rpp, struct buffer *
         return;
     }
     *rpp = rp;
-
-    return;
 }
 
 // Check for text enclosed in symbols, like (SOUND)
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index a9b0584351..deeb7b1276 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -616,7 +616,6 @@ static void deallocate_xvimage(struct vo *vo, int foo)
     ctx->Shminfo[foo] = (XShmSegmentInfo){0};
 
     XSync(vo->x11->display, False);
-    return;
 }
 
 static inline void put_xvimage(struct vo *vo, XvImage *xvi)
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 5660941a77..b31736ad05 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -2627,7 +2627,6 @@ static void remove_output(struct vo_wayland_output *out)
     talloc_free(out->make);
     talloc_free(out->model);
     talloc_free(out);
-    return;
 }
 
 static void remove_seat(struct vo_wayland_seat *seat)
@@ -2667,7 +2666,6 @@ static void remove_seat(struct vo_wayland_seat *seat)
 
     wl_seat_destroy(seat->seat);
     talloc_free(seat);
-    return;
 }
 
 static void seat_create_data_source(struct vo_wayland_seat *seat)