diff --git a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
index 7b67ea6c8..f64832b23 100644
--- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
@@ -33,7 +33,7 @@
 #include "TagFile.hxx"
 #include "fs/Traits.hxx"
 #include "fs/AllocatedPath.hxx"
-#include "util/StringView.hxx"
+#include "util/StringCompare.hxx"
 
 #include <memory>
 
@@ -77,8 +77,7 @@ public:
 void
 ExtractCuesheetTagHandler::OnPair(std::string_view name, std::string_view value) noexcept
 {
-	if (cuesheet.empty() &&
-	    StringView{name}.EqualsIgnoreCase("cuesheet"sv))
+	if (cuesheet.empty() && StringIsEqualIgnoreCase(name, "cuesheet"sv))
 		cuesheet = value;
 }
 
diff --git a/src/tag/Handler.cxx b/src/tag/Handler.cxx
index b482df4ef..07b81e2ea 100644
--- a/src/tag/Handler.cxx
+++ b/src/tag/Handler.cxx
@@ -21,6 +21,7 @@
 #include "Builder.hxx"
 #include "pcm/AudioFormat.hxx"
 #include "util/CharUtil.hxx"
+#include "util/StringCompare.hxx"
 #include "util/StringView.hxx"
 
 #include <algorithm>
@@ -81,7 +82,7 @@ AddTagHandler::OnTag(TagType type, std::string_view value) noexcept
 void
 FullTagHandler::OnPair(std::string_view name, std::string_view) noexcept
 {
-	if (StringView{name}.EqualsIgnoreCase("cuesheet"sv))
+	if (StringIsEqualIgnoreCase(name, "cuesheet"sv))
 		tag.SetHasPlaylist(true);
 }