diff --git a/src/cue/cue_tag.c b/src/cue/cue_tag.c
index 6c042a725..e5334c94b 100644
--- a/src/cue/cue_tag.c
+++ b/src/cue/cue_tag.c
@@ -1,5 +1,8 @@
 #include "config.h"
 #include "cue_tag.h"
+#include "tag.h"
+
+#include <libcue/libcue.h>
 
 static struct tag*
 cue_tag_cd(struct Cdtext* cdtext, struct Rem* rem)
diff --git a/src/cue/cue_tag.h b/src/cue/cue_tag.h
index aea585338..2a7738ea2 100644
--- a/src/cue/cue_tag.h
+++ b/src/cue/cue_tag.h
@@ -5,9 +5,9 @@
 
 #ifdef HAVE_CUE /* libcue */
 
-#include "tag.h"
+#include <stdio.h>
 
-#include <libcue/libcue.h>
+struct tag;
 
 struct tag*
 cue_tag_file(	FILE*,