diff --git a/src/output_all.c b/src/output_all.c
index 23d46b5f4..0cf0e924b 100644
--- a/src/output_all.c
+++ b/src/output_all.c
@@ -24,6 +24,7 @@
 #include "conf.h"
 #include "pipe.h"
 #include "buffer.h"
+#include "player_control.h"
 
 #ifndef NDEBUG
 #include "chunk.h"
@@ -414,7 +415,7 @@ audio_output_all_wait(unsigned threshold)
 	if (audio_output_all_check() < threshold)
 		return true;
 
-	notify_wait(&audio_output_client_notify);
+	notify_wait(&pc.notify);
 
 	return audio_output_all_check() < threshold;
 }
diff --git a/src/output_thread.c b/src/output_thread.c
index b545a62be..acedd863e 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -22,6 +22,7 @@
 #include "output_internal.h"
 #include "chunk.h"
 #include "pipe.h"
+#include "player_control.h"
 
 #include <glib.h>
 
@@ -156,7 +157,7 @@ static void ao_play(struct audio_output *ao)
 	ao->chunk_finished = true;
 	g_mutex_unlock(ao->mutex);
 
-	notify_signal(&audio_output_client_notify);
+	notify_signal(&pc.notify);
 }
 
 static void ao_pause(struct audio_output *ao)