From 46c15e4ab3aa4b0a973345afe704e80c2e8122e9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 16 Feb 2009 01:51:50 +0100
Subject: [PATCH] output: include cleanup

Don't include output_api.h in output_internal.h.  This change requires
adding missing includes in several sources.
---
 src/audio.c           | 1 +
 src/output_all.c      | 2 ++
 src/output_internal.h | 2 +-
 src/output_state.c    | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/audio.c b/src/audio.c
index a6deff082..efd0e3d93 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -20,6 +20,7 @@
 #include "audio_format.h"
 #include "audio_parser.h"
 #include "output_internal.h"
+#include "output_plugin.h"
 #include "output_all.h"
 #include "mixer_api.h"
 
diff --git a/src/output_all.c b/src/output_all.c
index fa2d741c2..18c885d94 100644
--- a/src/output_all.c
+++ b/src/output_all.c
@@ -19,8 +19,10 @@
 #include "output_all.h"
 #include "output_internal.h"
 #include "output_control.h"
+#include "conf.h"
 
 #include <assert.h>
+#include <string.h>
 
 static struct audio_format input_audio_format;
 
diff --git a/src/output_internal.h b/src/output_internal.h
index 9f842159f..7d02ea679 100644
--- a/src/output_internal.h
+++ b/src/output_internal.h
@@ -20,7 +20,7 @@
 #ifndef MPD_OUTPUT_INTERNAL_H
 #define MPD_OUTPUT_INTERNAL_H
 
-#include "output_api.h"
+#include "audio_format.h"
 #include "pcm_convert.h"
 #include "notify.h"
 
diff --git a/src/output_state.c b/src/output_state.c
index c28fc3915..2232bf5a9 100644
--- a/src/output_state.c
+++ b/src/output_state.c
@@ -28,8 +28,8 @@
 #include <glib.h>
 
 #include <assert.h>
-#include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define AUDIO_DEVICE_STATE "audio_device_state:"