include cleanup using iwyu

10 files changed, 11 insertions, 19 deletions

diff --git a/src/tag/Aiff.cxx b/src/tag/Aiff.cxx
index 73e46e49f..84c386678 100644
--- a/src/tag/Aiff.cxx
+++ b/src/tag/Aiff.cxx
@@ -26,9 +26,7 @@
 #include <limits>
 
 #include <stdint.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <string.h>
 
 static constexpr Domain aiff_domain("aiff");
diff --git a/src/tag/ApeTag.hxx b/src/tag/ApeTag.hxx
index e35edc381..d2c0365c7 100644
--- a/src/tag/ApeTag.hxx
+++ b/src/tag/ApeTag.hxx
@@ -34,6 +34,6 @@ extern const struct tag_table ape_tags[];
  */
 bool
 tag_ape_scan2(Path path_fs,
-	      const struct tag_handler *handler, void *handler_ctx);
+	      const tag_handler *handler, void *handler_ctx);
 
 #endif
diff --git a/src/tag/Riff.cxx b/src/tag/Riff.cxx
index ad64afc39..73b2139d3 100644
--- a/src/tag/Riff.cxx
+++ b/src/tag/Riff.cxx
@@ -26,7 +26,6 @@
 #include <limits>
 
 #include <stdint.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
 
diff --git a/src/tag/Tag.hxx b/src/tag/Tag.hxx
index 5846e7a9d..e404a4f26 100644
--- a/src/tag/Tag.hxx
+++ b/src/tag/Tag.hxx
@@ -20,8 +20,8 @@
 #ifndef MPD_TAG_HXX
 #define MPD_TAG_HXX
 
-#include "TagType.h"
-#include "TagItem.hxx"
+#include "TagType.h" // IWYU pragma: export
+#include "TagItem.hxx" // IWYU pragma: export
 #include "Compiler.h"
 
 #include <algorithm>
diff --git a/src/tag/TagConfig.cxx b/src/tag/TagConfig.cxx
index 96fd1847f..0213ab4dc 100644
--- a/src/tag/TagConfig.cxx
+++ b/src/tag/TagConfig.cxx
@@ -30,8 +30,6 @@
 
 #include <algorithm>
 
-#include <string.h>
-
 void
 TagLoadConfig()
 {
diff --git a/src/tag/TagConfig.hxx b/src/tag/TagConfig.hxx
index 5ec6766d4..3bc86cc40 100644
--- a/src/tag/TagConfig.hxx
+++ b/src/tag/TagConfig.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_TAG_CONFIG_HXX
 #define MPD_TAG_CONFIG_HXX
 
-#include "TagType.h"
-
 void
 TagLoadConfig();
 
diff --git a/src/tag/TagId3.cxx b/src/tag/TagId3.cxx
index df70a95e5..6e1f341a2 100644
--- a/src/tag/TagId3.cxx
+++ b/src/tag/TagId3.cxx
@@ -21,7 +21,6 @@
 #include "TagId3.hxx"
 #include "TagHandler.hxx"
 #include "TagTable.hxx"
-#include "Tag.hxx"
 #include "TagBuilder.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/tag/TagId3.hxx b/src/tag/TagId3.hxx
index 749166116..aa564e946 100644
--- a/src/tag/TagId3.hxx
+++ b/src/tag/TagId3.hxx
@@ -33,10 +33,10 @@ class Error;
 
 bool
 tag_id3_scan(Path path_fs,
-	     const struct tag_handler *handler, void *handler_ctx);
+	     const tag_handler *handler, void *handler_ctx);
 
 Tag *
-tag_id3_import(struct id3_tag *);
+tag_id3_import(id3_tag *);
 
 /**
  * Loads the ID3 tags from the file into a libid3tag object.  The
@@ -53,8 +53,8 @@ tag_id3_load(Path path_fs, Error &error);
  *
  */
 void
-scan_id3_tag(struct id3_tag *tag,
-	     const struct tag_handler *handler, void *handler_ctx);
+scan_id3_tag(id3_tag *tag,
+	     const tag_handler *handler, void *handler_ctx);
 
 #else
 
@@ -62,7 +62,7 @@ scan_id3_tag(struct id3_tag *tag,
 
 static inline bool
 tag_id3_scan(gcc_unused Path path_fs,
-	     gcc_unused const struct tag_handler *handler,
+	     gcc_unused const tag_handler *handler,
 	     gcc_unused void *handler_ctx)
 {
 	return false;
diff --git a/src/tag/TagRva2.cxx b/src/tag/TagRva2.cxx
index 204001aa7..442695581 100644
--- a/src/tag/TagRva2.cxx
+++ b/src/tag/TagRva2.cxx
@@ -21,10 +21,10 @@
 #include "TagRva2.hxx"
 #include "ReplayGainInfo.hxx"
 
+#include <id3tag.h>
+
 #include <stdint.h>
 #include <string.h>
-#include <glib.h>
-#include <id3tag.h>
 
 enum rva2_channel {
 	CHANNEL_OTHER = 0x00,
diff --git a/src/tag/TagRva2.hxx b/src/tag/TagRva2.hxx
index 98154041a..a1d67a777 100644
--- a/src/tag/TagRva2.hxx
+++ b/src/tag/TagRva2.hxx
@@ -32,6 +32,6 @@ struct ReplayGainInfo;
  * @return true on success
  */
 bool
-tag_rva2_parse(struct id3_tag *tag, ReplayGainInfo &replay_gain_info);
+tag_rva2_parse(id3_tag *tag, ReplayGainInfo &replay_gain_info);
 
 #endif