From a34e1d2b84c72b27212eed4e1483a20440da44ab Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 6 Sep 2008 20:28:31 +0200
Subject: include cleanup

As usual, include only headers which are really needed.
---
 src/audio.h          | 3 ++-
 src/client.c         | 1 -
 src/command.c        | 1 +
 src/command.h        | 1 +
 src/locate.c         | 1 +
 src/log.c            | 1 -
 src/player_control.c | 2 +-
 src/song.h           | 5 ++---
 src/stats.c          | 1 +
 9 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/audio.h b/src/audio.h
index 7fb2150cf..0703e402b 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -19,12 +19,13 @@
 #ifndef AUDIO_H
 #define AUDIO_H
 
-#include "tag.h"
 #include "os_compat.h"
 #include "audio_format.h"
 
 #define AUDIO_AO_DRIVER_DEFAULT	"default"
 
+struct tag;
+
 void copyAudioFormat(AudioFormat * dest, const AudioFormat * src);
 
 int cmpAudioFormat(const AudioFormat * dest, const AudioFormat * src);
diff --git a/src/client.c b/src/client.c
index 28fb52705..671337e81 100644
--- a/src/client.c
+++ b/src/client.c
@@ -25,7 +25,6 @@
 #include "sllist.h"
 #include "utils.h"
 #include "ioops.h"
-#include "myfprintf.h"
 #include "os_compat.h"
 #include "main_notify.h"
 #include "dlist.h"
diff --git a/src/command.c b/src/command.c
index 110ac7955..834fb6420 100644
--- a/src/command.c
+++ b/src/command.c
@@ -34,6 +34,7 @@
 #include "ack.h"
 #include "audio.h"
 #include "dbUtils.h"
+#include "tag.h"
 #include "client.h"
 #include "os_compat.h"
 
diff --git a/src/command.h b/src/command.h
index d421b8746..1018102cd 100644
--- a/src/command.h
+++ b/src/command.h
@@ -22,6 +22,7 @@
 #include "gcc.h"
 #include "os_compat.h"
 #include "sllist.h"
+#include "myfprintf.h"
 
 #define COMMAND_RETURN_KILL	10
 #define COMMAND_RETURN_CLOSE	20
diff --git a/src/locate.c b/src/locate.c
index 76e229f4c..2e17f7784 100644
--- a/src/locate.c
+++ b/src/locate.c
@@ -19,6 +19,7 @@
 #include "locate.h"
 #include "path.h"
 #include "utils.h"
+#include "tag.h"
 
 #define LOCATE_TAG_FILE_KEY     "file"
 #define LOCATE_TAG_FILE_KEY_OLD "filename"
diff --git a/src/log.c b/src/log.c
index e74654c3e..6f739797c 100644
--- a/src/log.c
+++ b/src/log.c
@@ -19,7 +19,6 @@
 #include "log.h"
 
 #include "conf.h"
-#include "myfprintf.h"
 #include "utils.h"
 #include "os_compat.h"
 
diff --git a/src/player_control.c b/src/player_control.c
index ae7e4e369..d4f8fcaf8 100644
--- a/src/player_control.c
+++ b/src/player_control.c
@@ -19,7 +19,7 @@
 #include "player_control.h"
 #include "path.h"
 #include "log.h"
-#include "ack.h"
+#include "tag.h"
 #include "os_compat.h"
 #include "main_notify.h"
 
diff --git a/src/song.h b/src/song.h
index f909c21ea..0f271aa83 100644
--- a/src/song.h
+++ b/src/song.h
@@ -19,10 +19,9 @@
 #ifndef SONG_H
 #define SONG_H
 
-#include "../config.h"
-#include "os_compat.h"
-#include "tag.h"
 #include "list.h"
+#include "os_compat.h"
+#include "mpd_types.h"
 
 #define SONG_BEGIN	"songList begin"
 #define SONG_END	"songList end"
diff --git a/src/stats.c b/src/stats.c
index 192187aca..7d5bf5d5c 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -19,6 +19,7 @@
 #include "stats.h"
 
 #include "directory.h"
+#include "tag.h"
 #include "myfprintf.h"
 #include "player_control.h"
 #include "tagTracker.h"
-- 
cgit v1.2.3