diff --git a/doc/snippets/MeshTools-gl.cpp b/doc/snippets/MeshTools-gl.cpp
index 9eb3ada46..ea46a90d0 100644
--- a/doc/snippets/MeshTools-gl.cpp
+++ b/doc/snippets/MeshTools-gl.cpp
@@ -24,6 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <utility> /* std::move() in a snippet */
 #include <Corrade/Containers/Pair.h>
 #include <Corrade/Containers/StridedArrayView.h>
 
diff --git a/doc/snippets/Vk.cpp b/doc/snippets/Vk.cpp
index c19f57b4d..375574787 100644
--- a/doc/snippets/Vk.cpp
+++ b/doc/snippets/Vk.cpp
@@ -24,6 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include <utility> /* std::move() in a snippet */
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/Containers/StringIterable.h>
diff --git a/src/Magnum/Animation/Test/TrackTest.cpp b/src/Magnum/Animation/Test/TrackTest.cpp
index dfd2f691c..2053f3359 100644
--- a/src/Magnum/Animation/Test/TrackTest.cpp
+++ b/src/Magnum/Animation/Test/TrackTest.cpp
@@ -25,6 +25,7 @@
 */
 
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h> /** @todo remove once Track is std::pair-free */
 
 #include "Magnum/Animation/Track.h"
 #include "Magnum/Math/Half.h"
diff --git a/src/Magnum/Animation/Track.h b/src/Magnum/Animation/Track.h
index 476e2e972..3ad98d829 100644
--- a/src/Magnum/Animation/Track.h
+++ b/src/Magnum/Animation/Track.h
@@ -30,6 +30,7 @@
  * @brief Class @ref Magnum::Animation::Track, @ref Magnum::Animation::TrackViewStorage, @ref Magnum::Animation::TrackView
  */
 
+#include <utility> /** @todo remove usage of std::pair from here */
 #include <Corrade/Containers/Array.h>
 
 #include "Magnum/Animation/Animation.h"
diff --git a/src/Magnum/Audio/Test/BufferALTest.cpp b/src/Magnum/Audio/Test/BufferALTest.cpp
index 451b46356..5003def00 100644
--- a/src/Magnum/Audio/Test/BufferALTest.cpp
+++ b/src/Magnum/Audio/Test/BufferALTest.cpp
@@ -28,6 +28,7 @@
 #include <Corrade/Containers/Pair.h>
 #include <Corrade/Containers/Reference.h>
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h> /** @todo remove once Buffer is std::pair-free */
 
 #include "Magnum/Audio/Buffer.h"
 #include "Magnum/Audio/BufferFormat.h"
diff --git a/src/Magnum/GL/DefaultFramebuffer.h b/src/Magnum/GL/DefaultFramebuffer.h
index 1be509531..d0a6786ac 100644
--- a/src/Magnum/GL/DefaultFramebuffer.h
+++ b/src/Magnum/GL/DefaultFramebuffer.h
@@ -30,6 +30,8 @@
  * @brief Class @ref Magnum::GL::DefaultFramebuffer
  */
 
+#include <initializer_list>
+
 #include "Magnum/GL/AbstractFramebuffer.h"
 
 #ifdef MAGNUM_BUILD_DEPRECATED
diff --git a/src/Magnum/GL/Framebuffer.h b/src/Magnum/GL/Framebuffer.h
index 51f15b380..b3490a8b9 100644
--- a/src/Magnum/GL/Framebuffer.h
+++ b/src/Magnum/GL/Framebuffer.h
@@ -31,6 +31,8 @@
  * @brief Class @ref Magnum::GL::Framebuffer
  */
 
+#include <initializer_list>
+
 #include "Magnum/Tags.h"
 #include "Magnum/GL/AbstractFramebuffer.h"
 
diff --git a/src/Magnum/ShaderTools/AbstractConverter.h b/src/Magnum/ShaderTools/AbstractConverter.h
index 7fb14b60c..34b045ae5 100644
--- a/src/Magnum/ShaderTools/AbstractConverter.h
+++ b/src/Magnum/ShaderTools/AbstractConverter.h
@@ -31,6 +31,7 @@
  * @m_since_latest
  */
 
+#include <initializer_list>
 #include <Corrade/Containers/EnumSet.h>
 #include <Corrade/PluginManager/AbstractManagingPlugin.h>
 #include <Corrade/Utility/StlForwardString.h> /** @todo remove once file callbacks are std::string-free */
diff --git a/src/Magnum/Test/PixelStorageTest.cpp b/src/Magnum/Test/PixelStorageTest.cpp
index 20b09beb1..ce78285cb 100644
--- a/src/Magnum/Test/PixelStorageTest.cpp
+++ b/src/Magnum/Test/PixelStorageTest.cpp
@@ -25,6 +25,7 @@
 */
 
 #include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/DebugStl.h> /** @todo drop once std::pair isn't used (i.e., the whole PixelStorage crap ceases to exist) */
 
 #include "Magnum/Image.h"
 #include "Magnum/PixelFormat.h"
diff --git a/src/Magnum/Text/AbstractGlyphCache.h b/src/Magnum/Text/AbstractGlyphCache.h
index 846ecefa5..696a00246 100644
--- a/src/Magnum/Text/AbstractGlyphCache.h
+++ b/src/Magnum/Text/AbstractGlyphCache.h
@@ -31,6 +31,7 @@
  * @m_since{2019,10}
  */
 
+#include <initializer_list>
 #include <Corrade/Containers/EnumSet.h>
 #include <Corrade/Containers/Pointer.h>
 
diff --git a/src/Magnum/TextureTools/Atlas.h b/src/Magnum/TextureTools/Atlas.h
index c4572b9a0..6afa1a496 100644
--- a/src/Magnum/TextureTools/Atlas.h
+++ b/src/Magnum/TextureTools/Atlas.h
@@ -30,6 +30,7 @@
  * @brief Class @ref Magnum::TextureTools::AtlasLandfill, enum @ref Magnum::TextureTools::AtlasLandfillFlag, enum set @ref Magnum::TextureTools::AtlasLandfillFlags, function @ref Magnum::TextureTools::atlas(), @ref Magnum::TextureTools::atlasArrayPowerOfTwo()
  */
 
+#include <initializer_list>
 #include <Corrade/Containers/Pointer.h>
 
 #include "Magnum/Magnum.h"
diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h
index 41aeb9cf7..bf089d329 100644
--- a/src/Magnum/Trade/AbstractImageConverter.h
+++ b/src/Magnum/Trade/AbstractImageConverter.h
@@ -30,6 +30,7 @@
  * @brief Class @ref Magnum::Trade::AbstractImageConverter, enum @ref Magnum::Trade::ImageConverterFeature, enum set @ref Magnum::Trade::ImageConverterFeatures
  */
 
+#include <initializer_list>
 #include <Corrade/PluginManager/AbstractManagingPlugin.h>
 
 #include "Magnum/Magnum.h"
diff --git a/src/Magnum/Vk/Assert.h b/src/Magnum/Vk/Assert.h
index 15ba44d2e..c2698cc99 100644
--- a/src/Magnum/Vk/Assert.h
+++ b/src/Magnum/Vk/Assert.h
@@ -31,6 +31,7 @@
  * @m_since_latest
  */
 
+#include <initializer_list> /* {} in for() loops, SIGH */
 #include <Corrade/Containers/EnumSet.h>
 #include <Corrade/Utility/Assert.h>
 
diff --git a/src/Magnum/Vk/DeviceCreateInfo.h b/src/Magnum/Vk/DeviceCreateInfo.h
index a03ceb202..6cc773586 100644
--- a/src/Magnum/Vk/DeviceCreateInfo.h
+++ b/src/Magnum/Vk/DeviceCreateInfo.h
@@ -32,6 +32,7 @@
  */
 
 #include <cstddef>
+#include <initializer_list>
 #include <Corrade/Containers/Pointer.h>
 
 #include "Magnum/Tags.h"
diff --git a/src/Magnum/Vk/FramebufferCreateInfo.h b/src/Magnum/Vk/FramebufferCreateInfo.h
index c18562b63..2c7ac5f3e 100644
--- a/src/Magnum/Vk/FramebufferCreateInfo.h
+++ b/src/Magnum/Vk/FramebufferCreateInfo.h
@@ -31,6 +31,7 @@
  * @m_since_latest
  */
 
+#include <initializer_list>
 #include <Corrade/Containers/Pointer.h>
 #include <Corrade/Containers/EnumSet.h>
 
diff --git a/src/Magnum/Vk/InstanceCreateInfo.h b/src/Magnum/Vk/InstanceCreateInfo.h
index ce7447a00..e806e391d 100644
--- a/src/Magnum/Vk/InstanceCreateInfo.h
+++ b/src/Magnum/Vk/InstanceCreateInfo.h
@@ -31,6 +31,7 @@
  * @m_since_latest
  */
 
+#include <initializer_list>
 #include <Corrade/Containers/Pointer.h>
 
 #include "Magnum/Tags.h"
diff --git a/src/Magnum/Vk/Queue.h b/src/Magnum/Vk/Queue.h
index 7c0e1159d..b998eb23c 100644
--- a/src/Magnum/Vk/Queue.h
+++ b/src/Magnum/Vk/Queue.h
@@ -31,6 +31,7 @@
  * @m_since_latest
  */
 
+#include <initializer_list>
 #include <Corrade/Containers/Pointer.h>
 
 #include "Magnum/Tags.h"
diff --git a/src/Magnum/Vk/RenderPassCreateInfo.h b/src/Magnum/Vk/RenderPassCreateInfo.h
index e3c45cda7..18bddc79d 100644
--- a/src/Magnum/Vk/RenderPassCreateInfo.h
+++ b/src/Magnum/Vk/RenderPassCreateInfo.h
@@ -31,6 +31,7 @@
  * @m_since_latest
  */
 
+#include <initializer_list>
 #include <Corrade/Containers/EnumSet.h>
 #include <Corrade/Containers/Pointer.h>
 
diff --git a/src/Magnum/Vk/ShaderSet.h b/src/Magnum/Vk/ShaderSet.h
index d653943c3..c542aeeb5 100644
--- a/src/Magnum/Vk/ShaderSet.h
+++ b/src/Magnum/Vk/ShaderSet.h
@@ -31,6 +31,7 @@
  * @m_since_latest
  */
 
+#include <initializer_list>
 #include <Corrade/Containers/Pointer.h>
 
 #include "Magnum/Tags.h"