diff --git a/src/TagPrint.cxx b/src/TagPrint.cxx
index e4d80e9bf..33f82c3f2 100644
--- a/src/TagPrint.cxx
+++ b/src/TagPrint.cxx
@@ -21,7 +21,6 @@
 #include "tag/Tag.hxx"
 #include "tag/Settings.hxx"
 #include "client/Response.hxx"
-#include "util/StringView.hxx"
 
 #include <fmt/format.h>
 
@@ -35,7 +34,7 @@ tag_print_types(Response &r) noexcept
 }
 
 void
-tag_print(Response &r, TagType type, StringView value) noexcept
+tag_print(Response &r, TagType type, std::string_view value) noexcept
 {
 	r.Fmt(FMT_STRING("{}: {}\n"), tag_item_names[type], value);
 }
diff --git a/src/TagPrint.hxx b/src/TagPrint.hxx
index 268c536e6..b29fdf6b2 100644
--- a/src/TagPrint.hxx
+++ b/src/TagPrint.hxx
@@ -21,18 +21,18 @@
 #define MPD_TAG_PRINT_HXX
 
 #include <cstdint>
+#include <string_view>
 
 enum TagType : uint8_t;
 
 struct Tag;
-struct StringView;
 class Response;
 
 void
 tag_print_types(Response &response) noexcept;
 
 void
-tag_print(Response &response, TagType type, StringView value) noexcept;
+tag_print(Response &response, TagType type, std::string_view value) noexcept;
 
 void
 tag_print(Response &response, TagType type, const char *value) noexcept;
diff --git a/src/db/plugins/simple/Song.hxx b/src/db/plugins/simple/Song.hxx
index 8866c9947..45b339422 100644
--- a/src/db/plugins/simple/Song.hxx
+++ b/src/db/plugins/simple/Song.hxx
@@ -30,7 +30,6 @@
 
 #include <string>
 
-struct StringView;
 struct Directory;
 class ExportedSong;
 class DetachedSong;