aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/audio.h3
-rw-r--r--src/client.c1
-rw-r--r--src/command.c1
-rw-r--r--src/command.h1
-rw-r--r--src/locate.c1
-rw-r--r--src/log.c1
-rw-r--r--src/player_control.c2
-rw-r--r--src/song.h5
-rw-r--r--src/stats.c1
9 files changed, 9 insertions, 7 deletions
diff --git a/src/audio.h b/src/audio.h
index 7fb2150c..0703e402 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 28fb5270..671337e8 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 110ac795..834fb642 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 d421b874..1018102c 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 76e229f4..2e17f778 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 e74654c3..6f739797 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 ae7e4e36..d4f8fcaf 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 f909c21e..0f271aa8 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 192187ac..7d5bf5d5 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"