diff --git a/src/Magnum/DebugTools/Test/CompareImageTest.cpp b/src/Magnum/DebugTools/Test/CompareImageTest.cpp
index 0cb4c318d..3960a7e69 100644
--- a/src/Magnum/DebugTools/Test/CompareImageTest.cpp
+++ b/src/Magnum/DebugTools/Test/CompareImageTest.cpp
@@ -29,6 +29,7 @@
 #include <Corrade/Containers/StridedArrayView.h>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/Containers/String.h>
+#include <Corrade/Containers/StringStl.h> /** @todo drop once Debug is stream-free */
 #include <Corrade/Containers/Triple.h>
 #include <Corrade/PluginManager/Manager.h>
 #include <Corrade/TestSuite/Tester.h>
diff --git a/src/Magnum/Trade/Implementation/converterUtilities.h b/src/Magnum/Trade/Implementation/converterUtilities.h
index a975db57b..eaf37fb54 100644
--- a/src/Magnum/Trade/Implementation/converterUtilities.h
+++ b/src/Magnum/Trade/Implementation/converterUtilities.h
@@ -32,10 +32,10 @@
 #include <Corrade/Containers/Pair.h>
 #include <Corrade/Containers/Reference.h>
 #include <Corrade/Containers/String.h>
+#include <Corrade/Containers/StringStl.h> /** @todo remove when Debug is stream-free */
 #include <Corrade/Containers/StringIterable.h>
 #include <Corrade/PluginManager/PluginMetadata.h>
 #include <Corrade/Utility/Format.h>
-#include <Corrade/Utility/FormatStl.h> /** @todo drop once String::replaceAll() has a StringView overload */
 #include <Corrade/Utility/String.h> /* replaceAll() */
 #include <Corrade/Utility/ConfigurationGroup.h>
 
@@ -86,7 +86,6 @@ void printPluginConfigurationInfo(Debug& d, const Utility::ConfigurationGroup& c
             /* Print the value wrapped in quotes if it contains spaces, indent
                also all newlines */
             if(i.second().contains('\n'))
-                /** @todo replaceAll() without std::string */
                 d << Utility::format("\"\"\"\n  {}\n  \"\"\"", Utility::String::replaceAll(i.second(), "\n", "\n  "));
             /** @todo less wasteful API for checking leading/trailing zeros? */
             else if(i.second().trimmed() != i.second())