diff --git a/src/storage/CompositeStorage.cxx b/src/storage/CompositeStorage.cxx
index fc82d457b..1a06e1afb 100644
--- a/src/storage/CompositeStorage.cxx
+++ b/src/storage/CompositeStorage.cxx
@@ -22,6 +22,7 @@
 #include "fs/AllocatedPath.hxx"
 #include "util/IterableSplitString.hxx"
 #include "util/StringCompare.hxx"
+#include "util/StringSplit.hxx"
 
 #include <set>
 #include <stdexcept>
@@ -86,8 +87,7 @@ CompositeDirectoryReader::GetInfo(bool follow)
 static std::string_view
 NextSegment(std::string_view &uri_r) noexcept
 {
-	StringView uri(uri_r);
-	auto s = uri.Split('/');
+	auto s = Split(uri_r, '/');
 	uri_r = s.second;
 	return s.first;
 }