Adapted to Corrade changes.

Mostly missing includes now.

doc/generated/easings.cpp

@@ -41,7 +41,7 @@
 */
 
 #include <Corrade/Utility/Directory.h>
-#include <Corrade/Utility/Format.h>
+#include <Corrade/Utility/FormatStl.h>
 #include <Corrade/Utility/String.h>
 
 #include "Magnum/Magnum.h"

doc/generated/primitives.cpp

@@ -23,6 +23,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <tuple>
+#include <Corrade/Containers/ArrayViewStl.h>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/PluginManager/Manager.h>
 #include <Corrade/Utility/Directory.h>

doc/generated/shaders.cpp

@@ -23,6 +23,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <Corrade/Containers/ArrayViewStl.h>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/PluginManager/Manager.h>
 #include <Corrade/Utility/Directory.h>

doc/snippets/MagnumPlatform-windowless.cpp

@@ -24,6 +24,7 @@
 */
 
 /* [windowless] */
+#include <Corrade/Utility/DebugStl.h>
 #include <Magnum/GL/Context.h>
 #include <Magnum/Platform/WindowlessEglApplication.h>
 

doc/snippets/getting-started-blue.cpp

@@ -26,6 +26,7 @@
 #include <Magnum/GL/DefaultFramebuffer.h>
 #include <Magnum/Platform/Sdl2Application.h>
 /** [0] */
+#include <Corrade/Utility/DebugStl.h>
 #include <Magnum/GL/Context.h>
 #include <Magnum/GL/Renderer.h>
 #include <Magnum/GL/Version.h>

src/Magnum/Animation/Test/EasingTest.cpp

@@ -27,7 +27,7 @@
 #include <Corrade/Containers/ArrayView.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>
-#include <Corrade/Utility/Format.h>
+#include <Corrade/Utility/FormatStl.h>
 
 #include "Magnum/Animation/Easing.h"
 

src/Magnum/Animation/Test/InterpolationTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Animation/Easing.h"
 #include "Magnum/Animation/Interpolation.h"

src/Magnum/Animation/Test/PlayerTest.cpp

@@ -27,6 +27,7 @@
 #include <Corrade/Containers/Reference.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Animation/Player.h"
 

src/Magnum/Audio/AbstractImporter.cpp

@@ -27,6 +27,7 @@
 
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/Directory.h>
 
 #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT

src/Magnum/Audio/Context.cpp

@@ -34,6 +34,7 @@
 
 #include <Corrade/Utility/Assert.h>
 #include <Corrade/Utility/Debug.h>
+#include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/String.h>
 
 #include "Magnum/Audio/Extensions.h"

src/Magnum/Audio/Test/BufferFormatTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Audio/BufferFormat.h"
 

src/Magnum/Audio/Test/ContextTest.cpp

@@ -26,6 +26,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Audio/Context.h"
 

src/Magnum/Audio/Test/RendererTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Magnum.h"
 #include "Magnum/Audio/Renderer.h"

src/Magnum/Audio/Test/SourceTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Audio/Source.h"
 

src/Magnum/Audio/al-info.cpp

@@ -24,6 +24,7 @@
 */
 
 #include <Corrade/Utility/Arguments.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Audio/Context.h"
 

src/Magnum/DebugTools/CompareImage.cpp

@@ -29,6 +29,7 @@
 #include <sstream>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/PluginManager/Manager.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"

src/Magnum/DebugTools/CompareImage.h

@@ -33,6 +33,8 @@
 #include <Corrade/Containers/Pointer.h>
 #include <Corrade/PluginManager/PluginManager.h>
 #include <Corrade/TestSuite/Comparator.h>
+#include <Corrade/Utility/StlForwardString.h>
+#include <Corrade/Utility/StlForwardTuple.h>
 
 #include "Magnum/Magnum.h"
 #include "Magnum/Math/Vector2.h"

src/Magnum/DebugTools/Profiler.cpp

@@ -29,6 +29,7 @@
 #include <numeric>
 #include <Corrade/Utility/Assert.h>
 #include <Corrade/Utility/Debug.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Magnum.h"
 

src/Magnum/DebugTools/Screenshot.cpp

@@ -27,6 +27,7 @@
 
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/PluginManager/Manager.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/PixelFormat.h"
 #include "Magnum/Image.h"

src/Magnum/DebugTools/Test/CompareImageTest.cpp

@@ -29,6 +29,7 @@
 #include <Corrade/PluginManager/Manager.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Container.h>
+#include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/Directory.h>
 #include <Corrade/Utility/String.h>
 

src/Magnum/DebugTools/Test/ScreenshotGLTest.cpp

@@ -27,7 +27,8 @@
 #include <Corrade/Containers/ScopeGuard.h>
 #include <Corrade/PluginManager/Manager.h>
 #include <Corrade/Utility/Directory.h>
-#include <Corrade/Utility/Format.h>
+#include <Corrade/Utility/DebugStl.h>
+#include <Corrade/Utility/FormatStl.h>
 
 #include "Magnum/ImageView.h"
 #include "Magnum/PixelFormat.h"

src/Magnum/GL/AbstractShaderProgram.cpp

@@ -27,6 +27,7 @@
 
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/Reference.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"

src/Magnum/GL/AbstractTexture.cpp

@@ -25,6 +25,7 @@
 
 #include "AbstractTexture.h"
 
+#include <tuple>
 #include <Corrade/Containers/Array.h>
 
 #include "Magnum/Array.h"

src/Magnum/GL/Buffer.cpp

@@ -25,6 +25,7 @@
 
 #include "Buffer.h"
 
+#include <tuple>
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Utility/Debug.h>
 

src/Magnum/GL/Buffer.h

@@ -35,6 +35,7 @@
 #include <Corrade/Containers/ArrayView.h>
 #include <Corrade/Containers/EnumSet.h>
 #include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/StlForwardTuple.h>
 
 #include "Magnum/Tags.h"
 #include "Magnum/GL/AbstractObject.h"

src/Magnum/GL/Context.cpp

@@ -34,6 +34,7 @@
 #include <Corrade/Containers/EnumSet.hpp>
 #include <Corrade/Utility/Arguments.h>
 #include <Corrade/Utility/Debug.h>
+#include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/String.h>
 
 #include "Magnum/GL/AbstractFramebuffer.h"

src/Magnum/GL/Context.h

@@ -35,6 +35,7 @@
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/Containers/Pointer.h>
 #include <Corrade/Containers/StaticArray.h>
+#include <Corrade/Utility/StlForwardString.h>
 
 #include "Magnum/Magnum.h"
 #include "Magnum/Math/BoolVector.h"

src/Magnum/GL/DebugOutput.cpp

@@ -28,6 +28,7 @@
 #ifndef MAGNUM_TARGET_WEBGL
 #include <Corrade/Utility/Assert.h>
 #include <Corrade/Utility/Debug.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"

src/Magnum/GL/Implementation/State.cpp

@@ -26,6 +26,7 @@
 #include "State.h"
 
 #include <algorithm>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"

src/Magnum/GL/Implementation/TextureState.cpp

@@ -25,6 +25,7 @@
 
 #include "TextureState.h"
 
+#include <tuple>
 #include <Corrade/Utility/Assert.h>
 
 #include "Magnum/GL/AbstractTexture.h"

src/Magnum/GL/Implementation/TextureState.h

@@ -28,6 +28,7 @@
 #include <string>
 #include <vector>
 #include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/StlForwardTuple.h>
 
 #include "Magnum/Magnum.h"
 #include "Magnum/GL/GL.h"

src/Magnum/GL/Implementation/driverSpecific.cpp

@@ -24,6 +24,9 @@
 */
 
 #include <algorithm>
+#include <string>
+#include <vector>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"

src/Magnum/GL/OpenGLTester.cpp

@@ -25,6 +25,8 @@
 
 #include "OpenGLTester.h"
 
+#include <string>
+
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"
 #ifndef MAGNUM_TARGET_WEBGL

src/Magnum/GL/Shader.cpp

@@ -29,6 +29,7 @@
 #include <Corrade/Containers/Reference.h>
 #include <Corrade/Utility/Assert.h>
 #include <Corrade/Utility/Debug.h>
+#include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/Directory.h>
 
 #include "Magnum/GL/Context.h"

src/Magnum/GL/Test/AbstractObjectGLTest.cpp

@@ -23,6 +23,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <Corrade/Utility/DebugStl.h>
+
 #include "Magnum/GL/Buffer.h"
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"

src/Magnum/GL/Test/AbstractQueryGLTest.cpp

@@ -23,6 +23,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <Corrade/Utility/DebugStl.h>
+
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"
 #include "Magnum/GL/OpenGLTester.h"

src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp

@@ -25,8 +25,9 @@
 
 #include <sstream>
 #include <Corrade/Containers/Reference.h>
-#include <Corrade/Utility/Resource.h>
 #include <Corrade/TestSuite/Compare/Container.h>
+#include <Corrade/Utility/DebugStl.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "Magnum/Image.h"
 #include "Magnum/GL/AbstractShaderProgram.h"

src/Magnum/GL/Test/AbstractTextureGLTest.cpp

@@ -23,6 +23,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <Corrade/Utility/DebugStl.h>
+
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"
 #include "Magnum/GL/Texture.h"

src/Magnum/GL/Test/AttributeTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/AbstractShaderProgram.h"
 

src/Magnum/GL/Test/BufferGLTest.cpp

@@ -24,9 +24,11 @@
 */
 
 #include <array>
+#include <tuple>
 #include <vector>
 #include <Corrade/Containers/Array.h>
 #include <Corrade/TestSuite/Compare/Container.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Buffer.h"
 #include "Magnum/GL/Context.h"

src/Magnum/GL/Test/BufferImageGLTest.cpp

@@ -26,6 +26,7 @@
 #include <sstream>
 #include <Corrade/Containers/Array.h>
 #include <Corrade/TestSuite/Compare/Container.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/PixelFormat.h"
 #include "Magnum/GL/BufferImage.h"

src/Magnum/GL/Test/BufferTest.cpp

@@ -26,6 +26,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Buffer.h"
 

src/Magnum/GL/Test/ContextTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Version.h"

src/Magnum/GL/Test/DebugOutputGLTest.cpp

@@ -24,6 +24,7 @@
 */
 
 #include <sstream>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/DebugOutput.h"

src/Magnum/GL/Test/DebugOutputTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/DebugOutput.h"
 

src/Magnum/GL/Test/DefaultFramebufferTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/DefaultFramebuffer.h"
 

src/Magnum/GL/Test/FramebufferGLTest.cpp

@@ -24,6 +24,7 @@
 */
 
 #include <Corrade/TestSuite/Compare/Container.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Image.h"
 #include "Magnum/GL/Context.h"

src/Magnum/GL/Test/FramebufferTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Framebuffer.h"
 

src/Magnum/GL/Test/MeshGLTest.cpp

@@ -24,6 +24,7 @@
 */
 
 #include <sstream>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Image.h"
 #include "Magnum/Mesh.h"

src/Magnum/GL/Test/MeshTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Mesh.h"
 #include "Magnum/GL/AbstractShaderProgram.h"

src/Magnum/GL/Test/PixelFormatTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/PixelFormat.h"
 #include "Magnum/GL/PixelFormat.h"

src/Magnum/GL/Test/RenderbufferGLTest.cpp

@@ -23,6 +23,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <Corrade/Utility/DebugStl.h>
+
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Extensions.h"
 #include "Magnum/GL/OpenGLTester.h"

src/Magnum/GL/Test/RendererTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Renderer.h"
 

src/Magnum/GL/Test/SamplerTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Sampler.h"
 #include "Magnum/GL/Sampler.h"

src/Magnum/GL/Test/ShaderGLTest.cpp

@@ -23,6 +23,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/Directory.h>
 
 #include "Magnum/GL/Context.h"

src/Magnum/GL/Test/ShaderTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Shader.h"
 

src/Magnum/GL/Test/TransformFeedbackGLTest.cpp

@@ -23,7 +23,9 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <tuple>
 #include <Corrade/Containers/Reference.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Image.h"
 #include "Magnum/GL/AbstractShaderProgram.h"

src/Magnum/GL/Test/VersionTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/GL/Version.h"
 

src/Magnum/GL/TransformFeedback.cpp

@@ -26,6 +26,7 @@
 #include "TransformFeedback.h"
 
 #ifndef MAGNUM_TARGET_GLES2
+#include <tuple>
 #include <Corrade/Utility/Assert.h>
 
 #include "Magnum/GL/AbstractShaderProgram.h"

src/Magnum/GL/TransformFeedback.h

@@ -26,6 +26,7 @@
 */
 
 #include <Corrade/Containers/ArrayView.h>
+#include <Corrade/Utility/StlForwardTuple.h>
 
 #include "Magnum/Tags.h"
 #include "Magnum/GL/AbstractObject.h"

src/Magnum/Math/Algorithms/Test/KahanSumTest.cpp

@@ -24,6 +24,7 @@
 */
 
 #include <numeric>
+#include <vector>
 #include <Corrade/TestSuite/Tester.h>
 
 #include "Magnum/Magnum.h"

src/Magnum/Math/Angle.cpp

@@ -28,6 +28,7 @@
 #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT)) || defined(CORRADE_TARGET_EMSCRIPTEN)
 #include <algorithm>
 #include <Corrade/Containers/ArrayView.h>
+#include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/String.h>
 #include <Corrade/Utility/TweakableParser.h>
 

src/Magnum/Math/Color.cpp

@@ -27,6 +27,7 @@
 
 #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT)) || defined(CORRADE_TARGET_EMSCRIPTEN)
 #include <cstring>
+#include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/String.h>
 #include <Corrade/Utility/Tweakable.h>
 #endif

src/Magnum/Math/ConfigurationValue.h

@@ -29,6 +29,7 @@
  * @brief Configuration value parsers and writers for @ref Magnum::Math types
  */
 
+#include <string>
 #include <Corrade/Utility/ConfigurationValue.h>
 
 #include "Magnum/Math/Angle.h"

src/Magnum/Math/FunctionsBatch.h

@@ -29,6 +29,7 @@
  * @brief Batch functions usable with scalar and vector types
  */
 
+#include <initializer_list>
 #include <Corrade/Containers/ArrayView.h>
 
 #include "Magnum/Math/Functions.h"

src/Magnum/Math/Half.cpp

@@ -27,6 +27,7 @@
 
 #include <iomanip>
 #include <sstream>
+#include <Corrade/Utility/DebugStl.h>
 
 #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT)) || defined(CORRADE_TARGET_EMSCRIPTEN)
 #include <algorithm>

src/Magnum/Math/Test/AngleTest.cpp

@@ -27,8 +27,9 @@
 #include <sstream>
 #include <Corrade/Containers/ArrayView.h>
 #include <Corrade/TestSuite/Tester.h>
-#include <Corrade/Utility/Format.h>
+#include <Corrade/Utility/DebugStl.h>
 #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT)) || defined(CORRADE_TARGET_EMSCRIPTEN)
+#include <Corrade/Utility/FormatStl.h>
 #include <Corrade/Utility/TweakableParser.h>
 #endif
 

src/Magnum/Math/Test/BezierTest.cpp

@@ -26,6 +26,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Bezier.h"
 #include "Magnum/Math/CubicHermite.h"

src/Magnum/Math/Test/BoolVectorTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/BoolVector.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/ColorTest.cpp

@@ -26,8 +26,9 @@
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>
-#include <Corrade/Utility/Format.h>
+#include <Corrade/Utility/DebugStl.h>
 #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT)) || defined(CORRADE_TARGET_EMSCRIPTEN)
+#include <Corrade/Utility/FormatStl.h>
 #include <Corrade/Utility/Tweakable.h>
 #endif
 

src/Magnum/Math/Test/ComplexTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Complex.h"
 #include "Magnum/Math/Matrix3.h"

src/Magnum/Math/Test/ConfigurationValueTest.cpp

@@ -25,6 +25,7 @@
 
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/Configuration.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/ConfigurationValue.h"
 

src/Magnum/Math/Test/CubicHermiteTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Bezier.h"
 #include "Magnum/Math/CubicHermite.h"

src/Magnum/Math/Test/DistanceTest.cpp

@@ -26,6 +26,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Constants.h"
 #include "Magnum/Math/Distance.h"

src/Magnum/Math/Test/DualComplexTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/DualComplex.h"
 #include "Magnum/Math/DualQuaternion.h"

src/Magnum/Math/Test/DualQuaternionTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/DualQuaternion.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/DualTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Dual.h"
 #include "Magnum/Math/Quaternion.h"

src/Magnum/Math/Test/FrustumTest.cpp

@@ -28,6 +28,7 @@
 #include <Corrade/Containers/ArrayView.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Container.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Frustum.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/HalfTest.cpp

@@ -27,6 +27,7 @@
 #include <algorithm>
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT)) || defined(CORRADE_TARGET_EMSCRIPTEN)
 #include <Corrade/Utility/Tweakable.h>
 #endif

src/Magnum/Math/Test/IntersectionTest.cpp

@@ -26,6 +26,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Intersection.h"
 

src/Magnum/Math/Test/Matrix3Test.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Matrix3.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/Matrix4Test.cpp

@@ -26,6 +26,7 @@
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Matrix4.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/MatrixTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Matrix.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/QuaternionTest.cpp

@@ -26,6 +26,7 @@
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Matrix4.h"
 #include "Magnum/Math/Quaternion.h"

src/Magnum/Math/Test/RangeTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/FunctionsBatch.h"
 #include "Magnum/Math/Range.h"

src/Magnum/Math/Test/RectangularMatrixTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/RectangularMatrix.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/StrictWeakOrderingTest.cpp

@@ -27,7 +27,7 @@
 #include <map>
 #include <set>
 #include <Corrade/TestSuite/Tester.h>
-#include <Corrade/Utility/Format.h>
+#include <Corrade/Utility/FormatStl.h>
 
 #include "Magnum/Math/Vector2.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/TypeTraitsTest.cpp

@@ -23,7 +23,9 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <string>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/TypeTraits.h"
 #include "Magnum/Math/Constants.h"

src/Magnum/Math/Test/UnitTest.cpp

@@ -23,6 +23,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <new>
 #include <Corrade/TestSuite/Tester.h>
 
 #include "Magnum/Math/Constants.h"

src/Magnum/Math/Test/Vector2Test.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Vector3.h" /* Vector3 used in Vector2Test::cross() */
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/Vector3Test.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Vector3.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/Vector4Test.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Vector4.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/Math/Test/VectorTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Vector.h"
 #include "Magnum/Math/StrictWeakOrdering.h"

src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp

@@ -26,6 +26,7 @@
 #include <functional>
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Magnum.h"
 #include "Magnum/MeshTools/CombineIndexedArrays.h"

src/Magnum/MeshTools/Test/CompressIndicesTest.cpp

@@ -27,6 +27,7 @@
 #include <Corrade/Containers/Array.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Container.h>
+#include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/Endianness.h>
 
 #include "Magnum/MeshTools/CompressIndices.h"

src/Magnum/MeshTools/Test/FlipNormalsTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Vector3.h"
 #include "Magnum/MeshTools/FlipNormals.h"

src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp

@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/Math/Vector3.h"
 #include "Magnum/MeshTools/GenerateFlatNormals.h"

src/Magnum/MeshTools/Test/InterleaveTest.cpp

@@ -24,9 +24,11 @@
 */
 
 #include <sstream>
+#include <vector>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/Endianness.h>
 #include <Corrade/Utility/Debug.h>
+#include <Corrade/Utility/DebugStl.h>
 
 #include "Magnum/MeshTools/Interleave.h"
 

src/Magnum/Platform/AbstractXApplication.h

@@ -32,6 +32,7 @@
 #include "Magnum/configure.h"
 
 #ifdef MAGNUM_TARGET_GL
+#include <string>
 #include <Corrade/Containers/EnumSet.h>
 #include <Corrade/Containers/Pointer.h>
 

src/Magnum/Platform/Sdl2Application.h

@@ -29,6 +29,7 @@
  * @brief Class @ref Magnum::Platform::Sdl2Application, macro @ref MAGNUM_SDL2APPLICATION_MAIN()
  */
 
+#include <string>
 #include <Corrade/Containers/ArrayView.h>
 #include <Corrade/Containers/EnumSet.h>
 #include <Corrade/Containers/Pointer.h>