include cleanup

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);

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"

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"
 

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

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"

src/log.c

@@ -19,7 +19,6 @@
 #include "log.h"
 
 #include "conf.h"
-#include "myfprintf.h"
 #include "utils.h"
 #include "os_compat.h"
 

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"
 

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"

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"