diff --git a/src/lib/curl/Escape.cxx b/src/lib/curl/Escape.cxx
index e6912b6d7..e97e0bd56 100644
--- a/src/lib/curl/Escape.cxx
+++ b/src/lib/curl/Escape.cxx
@@ -33,7 +33,7 @@
 #include "util/IterableSplitString.hxx"
 
 std::string
-CurlEscapeUriPath(CURL *curl, StringView src) noexcept
+CurlEscapeUriPath(CURL *curl, std::string_view src) noexcept
 {
 	std::string dest;
 
@@ -48,23 +48,23 @@ CurlEscapeUriPath(CURL *curl, StringView src) noexcept
 }
 
 std::string
-CurlEscapeUriPath(StringView src) noexcept
+CurlEscapeUriPath(std::string_view src) noexcept
 {
 	CurlEasy easy;
 	return CurlEscapeUriPath(easy.Get(), src);
 }
 
 std::string
-CurlUnescape(CURL *curl, StringView src) noexcept
+CurlUnescape(CURL *curl, std::string_view src) noexcept
 {
 	int outlength;
-	CurlString tmp(curl_easy_unescape(curl, src.data, src.size,
+	CurlString tmp(curl_easy_unescape(curl, src.data(), src.size(),
 					  &outlength));
 	return {tmp.c_str(), size_t(outlength)};
 }
 
 std::string
-CurlUnescape(StringView src) noexcept
+CurlUnescape(std::string_view src) noexcept
 {
 	CurlEasy easy;
 	return CurlUnescape(easy.Get(), src);
diff --git a/src/lib/curl/Escape.hxx b/src/lib/curl/Escape.hxx
index 1a7c9ab70..77ff9f6da 100644
--- a/src/lib/curl/Escape.hxx
+++ b/src/lib/curl/Escape.hxx
@@ -33,19 +33,18 @@
 #include <curl/curl.h>
 
 #include <string>
-
-struct StringView;
+#include <string_view>
 
 std::string
-CurlEscapeUriPath(CURL *curl, StringView src) noexcept;
+CurlEscapeUriPath(CURL *curl, std::string_view src) noexcept;
 
 std::string
-CurlEscapeUriPath(StringView src) noexcept;
+CurlEscapeUriPath(std::string_view src) noexcept;
 
 std::string
-CurlUnescape(CURL *curl, StringView src) noexcept;
+CurlUnescape(CURL *curl, std::string_view src) noexcept;
 
 std::string
-CurlUnescape(StringView src) noexcept;
+CurlUnescape(std::string_view src) noexcept;
 
 #endif