diff --git a/src/output_all.c b/src/output_all.c
index 8dce9192b..7830826b5 100644
--- a/src/output_all.c
+++ b/src/output_all.c
@@ -27,6 +27,7 @@
 #include "buffer.h"
 #include "player_control.h"
 #include "mpd_error.h"
+#include "notify.h"
 
 #ifndef NDEBUG
 #include "chunk.h"
diff --git a/src/output_thread.c b/src/output_thread.c
index 3e1cd4a25..9d17cfbec 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -29,6 +29,7 @@
 #include "filter/convert_filter_plugin.h"
 #include "filter/replay_gain_filter_plugin.h"
 #include "mpd_error.h"
+#include "notify.h"
 
 #include <glib.h>
 
diff --git a/src/player_control.h b/src/player_control.h
index d37413b55..b57e67320 100644
--- a/src/player_control.h
+++ b/src/player_control.h
@@ -20,9 +20,10 @@
 #ifndef MPD_PLAYER_H
 #define MPD_PLAYER_H
 
-#include "notify.h"
 #include "audio_format.h"
 
+#include <glib.h>
+
 #include <stdint.h>
 
 struct decoder_control;