diff --git a/src/audio.c b/src/audio.c
index efd0e3d93..8c5132199 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -23,6 +23,7 @@
 #include "output_plugin.h"
 #include "output_all.h"
 #include "mixer_api.h"
+#include "conf.h"
 
 #include <glib.h>
 
diff --git a/src/mixer_api.h b/src/mixer_api.h
index 8dbbbe820..48f962ed7 100644
--- a/src/mixer_api.h
+++ b/src/mixer_api.h
@@ -19,7 +19,7 @@
 #ifndef MPD_MIXER_H
 #define MPD_MIXER_H
 
-#include "conf.h"
+#include <stdbool.h>
 
 /*
  * list of currently implemented mixers
@@ -28,6 +28,8 @@
 extern const struct mixer_plugin alsa_mixer;
 extern const struct mixer_plugin oss_mixer;
 
+struct config_param;
+
 struct mixer_plugin {
 	/**
          * Alocates and configures a mixer device.