diff --git a/src/Magnum/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h
index 98af54200..4167a3aa0 100644
--- a/src/Magnum/AbstractFramebuffer.h
+++ b/src/Magnum/AbstractFramebuffer.h
@@ -28,7 +28,7 @@
  * @brief Class @ref Magnum::AbstractFramebuffer, enum @ref Magnum::FramebufferClear, @ref Magnum::FramebufferBlit, @ref Magnum::FramebufferBlitFilter, @ref Magnum::FramebufferTarget, enum set @ref Magnum::FramebufferClearMask
  */
 
-#include <Containers/EnumSet.h>
+#include <Corrade/Containers/EnumSet.h>
 
 #include "Math/Range.h"
 #include "Magnum.h"
diff --git a/src/Magnum/AbstractImage.cpp b/src/Magnum/AbstractImage.cpp
index fa6f7d599..c6c3adf29 100644
--- a/src/Magnum/AbstractImage.cpp
+++ b/src/Magnum/AbstractImage.cpp
@@ -24,7 +24,7 @@
 
 #include "AbstractImage.h"
 
-#include <Utility/Assert.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "Math/Vector.h"
 #include "ColorFormat.h"
diff --git a/src/Magnum/AbstractObject.cpp b/src/Magnum/AbstractObject.cpp
index 74b2df9ba..10eb46795 100644
--- a/src/Magnum/AbstractObject.cpp
+++ b/src/Magnum/AbstractObject.cpp
@@ -24,7 +24,7 @@
 
 #include "AbstractObject.h"
 
-#include <Utility/Assert.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h
index c43710692..62c3092a1 100644
--- a/src/Magnum/AbstractShaderProgram.h
+++ b/src/Magnum/AbstractShaderProgram.h
@@ -29,7 +29,7 @@
  */
 
 #include <string>
-#include <Containers/EnumSet.h>
+#include <Corrade/Containers/EnumSet.h>
 
 #include "AbstractObject.h"
 #include "Magnum.h"
diff --git a/src/Magnum/Audio/AbstractImporter.cpp b/src/Magnum/Audio/AbstractImporter.cpp
index 8ea19b564..88f1a665d 100644
--- a/src/Magnum/Audio/AbstractImporter.cpp
+++ b/src/Magnum/Audio/AbstractImporter.cpp
@@ -24,9 +24,9 @@
 
 #include "AbstractImporter.h"
 
-#include <Containers/Array.h>
-#include <Utility/Assert.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Directory.h>
 
 namespace Magnum { namespace Audio {
 
diff --git a/src/Magnum/Audio/AbstractImporter.h b/src/Magnum/Audio/AbstractImporter.h
index f4ba8b15b..ce02c4f9a 100644
--- a/src/Magnum/Audio/AbstractImporter.h
+++ b/src/Magnum/Audio/AbstractImporter.h
@@ -28,7 +28,7 @@
  * @brief Class Magnum::Audio::AbstractImporter
  */
 
-#include <PluginManager/AbstractPlugin.h>
+#include <Corrade/PluginManager/AbstractPlugin.h>
 
 #include "Magnum.h"
 #include "Audio/Buffer.h"
diff --git a/src/Magnum/Audio/Buffer.cpp b/src/Magnum/Audio/Buffer.cpp
index 1a28d95c1..36de21bd9 100644
--- a/src/Magnum/Audio/Buffer.cpp
+++ b/src/Magnum/Audio/Buffer.cpp
@@ -24,7 +24,7 @@
 
 #include "Buffer.h"
 
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 namespace Magnum { namespace Audio {
 
diff --git a/src/Magnum/Audio/Buffer.h b/src/Magnum/Audio/Buffer.h
index 31774c9e5..1122f561c 100644
--- a/src/Magnum/Audio/Buffer.h
+++ b/src/Magnum/Audio/Buffer.h
@@ -30,7 +30,7 @@
 
 #include <utility>
 #include <al.h>
-#include <Containers/Array.h>
+#include <Corrade/Containers/Array.h>
 
 #include "Magnum.h"
 #include "Audio/magnumAudioVisibility.h"
diff --git a/src/Magnum/Audio/Context.cpp b/src/Magnum/Audio/Context.cpp
index 86af094de..9fdf451cb 100644
--- a/src/Magnum/Audio/Context.cpp
+++ b/src/Magnum/Audio/Context.cpp
@@ -25,8 +25,8 @@
 #include "Context.h"
 
 #include <alc.h>
-#include <Utility/Assert.h>
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Magnum.h"
 
diff --git a/src/Magnum/Audio/Renderer.cpp b/src/Magnum/Audio/Renderer.cpp
index 4dbeae53f..5dd492c2c 100644
--- a/src/Magnum/Audio/Renderer.cpp
+++ b/src/Magnum/Audio/Renderer.cpp
@@ -24,7 +24,7 @@
 
 #include "Renderer.h"
 
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 namespace Magnum { namespace Audio {
 
diff --git a/src/Magnum/Audio/Source.cpp b/src/Magnum/Audio/Source.cpp
index aaa0ab9d4..e5a25acae 100644
--- a/src/Magnum/Audio/Source.cpp
+++ b/src/Magnum/Audio/Source.cpp
@@ -24,7 +24,7 @@
 
 #include "Source.h"
 
-#include <Containers/Array.h>
+#include <Corrade/Containers/Array.h>
 
 #include "Audio/Buffer.h"
 
diff --git a/src/Magnum/Audio/Test/AbstractImporterTest.cpp b/src/Magnum/Audio/Test/AbstractImporterTest.cpp
index ff479d654..7bd92b9a1 100644
--- a/src/Magnum/Audio/Test/AbstractImporterTest.cpp
+++ b/src/Magnum/Audio/Test/AbstractImporterTest.cpp
@@ -22,9 +22,9 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Containers/Array.h>
-#include <TestSuite/Tester.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "Audio/AbstractImporter.h"
 
diff --git a/src/Magnum/Audio/Test/BufferTest.cpp b/src/Magnum/Audio/Test/BufferTest.cpp
index 56c6f2ba9..5e4bd63c9 100644
--- a/src/Magnum/Audio/Test/BufferTest.cpp
+++ b/src/Magnum/Audio/Test/BufferTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Audio/Buffer.h"
 
diff --git a/src/Magnum/Audio/Test/RendererTest.cpp b/src/Magnum/Audio/Test/RendererTest.cpp
index 9be69593d..7751c67ea 100644
--- a/src/Magnum/Audio/Test/RendererTest.cpp
+++ b/src/Magnum/Audio/Test/RendererTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Audio/Renderer.h"
 
diff --git a/src/Magnum/Audio/Test/SourceTest.cpp b/src/Magnum/Audio/Test/SourceTest.cpp
index 90424ce29..35f658683 100644
--- a/src/Magnum/Audio/Test/SourceTest.cpp
+++ b/src/Magnum/Audio/Test/SourceTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Audio/Source.h"
 
diff --git a/src/Magnum/Audio/magnumAudioVisibility.h b/src/Magnum/Audio/magnumAudioVisibility.h
index cc4600394..f99a51c24 100644
--- a/src/Magnum/Audio/magnumAudioVisibility.h
+++ b/src/Magnum/Audio/magnumAudioVisibility.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "magnumConfigure.h"
 
diff --git a/src/Magnum/Buffer.cpp b/src/Magnum/Buffer.cpp
index aaf53b5ca..a453a9e5c 100644
--- a/src/Magnum/Buffer.cpp
+++ b/src/Magnum/Buffer.cpp
@@ -24,7 +24,7 @@
 
 #include "Buffer.h"
 
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h
index 5b0f5dd8a..b03df8373 100644
--- a/src/Magnum/Buffer.h
+++ b/src/Magnum/Buffer.h
@@ -31,9 +31,9 @@
 #include <cstddef>
 #include <array>
 #include <vector>
-#include <Containers/Array.h>
-#include <Containers/EnumSet.h>
-#include <Utility/Assert.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Containers/EnumSet.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "AbstractObject.h"
 #include "Magnum.h"
diff --git a/src/Magnum/ColorFormat.cpp b/src/Magnum/ColorFormat.cpp
index 7b3403ec2..d4b493297 100644
--- a/src/Magnum/ColorFormat.cpp
+++ b/src/Magnum/ColorFormat.cpp
@@ -24,7 +24,7 @@
 
 #include "ColorFormat.h"
 
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 namespace Magnum {
 
diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp
index 1306cb5c5..6896c47fb 100644
--- a/src/Magnum/Context.cpp
+++ b/src/Magnum/Context.cpp
@@ -26,8 +26,8 @@
 
 #include <string>
 #include <unordered_map>
-#include <Utility/Debug.h>
-#include <Utility/String.h>
+#include <Corrade/Utility/Debug.h>
+#include <Corrade/Utility/String.h>
 
 #include "AbstractFramebuffer.h"
 #include "AbstractShaderProgram.h"
diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h
index e6837c6bb..300f465a6 100644
--- a/src/Magnum/Context.h
+++ b/src/Magnum/Context.h
@@ -31,7 +31,7 @@
 #include <cstdlib>
 #include <bitset>
 #include <vector>
-#include <Containers/EnumSet.h>
+#include <Corrade/Containers/EnumSet.h>
 
 #include "Magnum.h"
 #include "OpenGL.h"
diff --git a/src/Magnum/DebugMessage.cpp b/src/Magnum/DebugMessage.cpp
index 763c322de..76ef91f6c 100644
--- a/src/Magnum/DebugMessage.cpp
+++ b/src/Magnum/DebugMessage.cpp
@@ -24,7 +24,7 @@
 
 #include "DebugMessage.h"
 
-#include <Utility/Assert.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h
index 0996a20f7..d0375677f 100644
--- a/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h
+++ b/src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h
@@ -29,8 +29,6 @@
 #include "Resource.h"
 #include "Shaders/Shaders.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace DebugTools { namespace Implementation {
 
 template<UnsignedInt dimensions> class AbstractBoxRenderer;
diff --git a/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h
index 999cc4bf1..f1eb9a990 100644
--- a/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h
+++ b/src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h
@@ -24,12 +24,11 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "AbstractBoxRenderer.h"
+#include <Corrade/compatibility.h>
 
+#include "AbstractBoxRenderer.h"
 #include "Shapes/Shapes.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace DebugTools { namespace Implementation {
 
 template<UnsignedInt dimensions> class AxisAlignedBoxRenderer: public AbstractBoxRenderer<dimensions> {
diff --git a/src/Magnum/DebugTools/Implementation/BoxRenderer.h b/src/Magnum/DebugTools/Implementation/BoxRenderer.h
index 54b00cfd2..f1a361b6d 100644
--- a/src/Magnum/DebugTools/Implementation/BoxRenderer.h
+++ b/src/Magnum/DebugTools/Implementation/BoxRenderer.h
@@ -24,12 +24,11 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "AbstractBoxRenderer.h"
+#include <Corrade/compatibility.h>
 
+#include "AbstractBoxRenderer.h"
 #include "Shapes/Shapes.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace DebugTools { namespace Implementation {
 
 template<UnsignedInt dimensions> class BoxRenderer: public AbstractBoxRenderer<dimensions> {
diff --git a/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h
index 5a2553470..a448e821e 100644
--- a/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h
+++ b/src/Magnum/DebugTools/Implementation/CapsuleRenderer.h
@@ -24,12 +24,11 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "AbstractShapeRenderer.h"
+#include <Corrade/compatibility.h>
 
+#include "AbstractShapeRenderer.h"
 #include "Shapes/Shapes.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace DebugTools { namespace Implementation {
 
 template<UnsignedInt dimensions> class AbstractCapsuleRenderer;
diff --git a/src/Magnum/DebugTools/Implementation/CylinderRenderer.h b/src/Magnum/DebugTools/Implementation/CylinderRenderer.h
index d5a511254..c98aa5f51 100644
--- a/src/Magnum/DebugTools/Implementation/CylinderRenderer.h
+++ b/src/Magnum/DebugTools/Implementation/CylinderRenderer.h
@@ -24,12 +24,11 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "AbstractShapeRenderer.h"
+#include <Corrade/compatibility.h>
 
+#include "AbstractShapeRenderer.h"
 #include "Shapes/Shapes.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace DebugTools { namespace Implementation {
 
 template<UnsignedInt dimensions> class AbstractCylinderRenderer;
diff --git a/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h
index 556db46ec..9e17c0a00 100644
--- a/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h
+++ b/src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h
@@ -24,12 +24,11 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "AbstractShapeRenderer.h"
+#include <Corrade/compatibility.h>
 
+#include "AbstractShapeRenderer.h"
 #include "Shapes/Shapes.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace DebugTools { namespace Implementation {
 
 template<UnsignedInt dimensions> class LineSegmentRenderer: public AbstractShapeRenderer<dimensions> {
diff --git a/src/Magnum/DebugTools/Implementation/PointRenderer.h b/src/Magnum/DebugTools/Implementation/PointRenderer.h
index adb88415b..a3adc9f47 100644
--- a/src/Magnum/DebugTools/Implementation/PointRenderer.h
+++ b/src/Magnum/DebugTools/Implementation/PointRenderer.h
@@ -24,12 +24,11 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "AbstractShapeRenderer.h"
+#include <Corrade/compatibility.h>
 
+#include "AbstractShapeRenderer.h"
 #include "Shapes/Shapes.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace DebugTools { namespace Implementation {
 
 template<UnsignedInt dimensions> class PointRenderer: public AbstractShapeRenderer<dimensions> {
diff --git a/src/Magnum/DebugTools/Implementation/SphereRenderer.h b/src/Magnum/DebugTools/Implementation/SphereRenderer.h
index 14687a6ee..62f892e10 100644
--- a/src/Magnum/DebugTools/Implementation/SphereRenderer.h
+++ b/src/Magnum/DebugTools/Implementation/SphereRenderer.h
@@ -24,12 +24,11 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "AbstractShapeRenderer.h"
+#include <Corrade/compatibility.h>
 
+#include "AbstractShapeRenderer.h"
 #include "Shapes/Shapes.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace DebugTools { namespace Implementation {
 
 template<UnsignedInt dimensions> class AbstractSphereRenderer;
diff --git a/src/Magnum/DebugTools/Profiler.cpp b/src/Magnum/DebugTools/Profiler.cpp
index 465833b96..2528ee29d 100644
--- a/src/Magnum/DebugTools/Profiler.cpp
+++ b/src/Magnum/DebugTools/Profiler.cpp
@@ -26,7 +26,7 @@
 
 #include <algorithm>
 #include <numeric>
-#include <Utility/Assert.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "Magnum.h"
 
diff --git a/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp b/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp
index 0ec537c9c..65a28d4e3 100644
--- a/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp
+++ b/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "DebugTools/Implementation/CapsuleRendererTransformation.h"
 
diff --git a/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp b/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp
index 9c18c51fa..2b4d94c63 100644
--- a/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp
+++ b/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "DebugTools/Implementation/CylinderRendererTransformation.h"
 
diff --git a/src/Magnum/DebugTools/Test/ForceRendererTest.cpp b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp
index d560e8e38..2c440ac49 100644
--- a/src/Magnum/DebugTools/Test/ForceRendererTest.cpp
+++ b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "DebugTools/Implementation/ForceRendererTransformation.h"
 
diff --git a/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp b/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp
index c87f992d3..835e4b30f 100644
--- a/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp
+++ b/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
diff --git a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h b/src/Magnum/DebugTools/magnumDebugToolsVisibility.h
index 2499c5d24..d3405f72a 100644
--- a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h
+++ b/src/Magnum/DebugTools/magnumDebugToolsVisibility.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "magnumConfigure.h"
 
diff --git a/src/Magnum/DefaultFramebuffer.cpp b/src/Magnum/DefaultFramebuffer.cpp
index 51193daff..c4b81e1bc 100644
--- a/src/Magnum/DefaultFramebuffer.cpp
+++ b/src/Magnum/DefaultFramebuffer.cpp
@@ -24,7 +24,7 @@
 
 #include "DefaultFramebuffer.h"
 
-#include <Containers/Array.h>
+#include <Corrade/Containers/Array.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Implementation/BufferState.cpp b/src/Magnum/Implementation/BufferState.cpp
index e844f8991..d34618806 100644
--- a/src/Magnum/Implementation/BufferState.cpp
+++ b/src/Magnum/Implementation/BufferState.cpp
@@ -24,7 +24,7 @@
 
 #include "BufferState.h"
 
-#include <Utility/Assert.h>
+#include <Corrade/Utility/Assert.h>
 
 namespace Magnum { namespace Implementation {
 
diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h
index 96d5f8e70..611d4dffd 100644
--- a/src/Magnum/Magnum.h
+++ b/src/Magnum/Magnum.h
@@ -28,14 +28,14 @@
  * @brief Forward declarations for Magnum namespace
  */
 
-#include <Utility/Utility.h>
+#include <Corrade/Utility/Utility.h>
 
 #include "Math/Math.h"
 #include "Types.h"
 #include "magnumConfigure.h"
 
 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Utility/Macros.h>
+#include <Corrade/Utility/Macros.h>
 #endif
 
 #ifndef DOXYGEN_GENERATING_OUTPUT
diff --git a/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp b/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp
index b20652c18..8148b9608 100644
--- a/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp
+++ b/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Algorithms/GaussJordan.h"
 
diff --git a/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp b/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp
index 494615329..57c070d45 100644
--- a/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp
+++ b/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Algorithms/GramSchmidt.h"
 
diff --git a/src/Magnum/Math/Algorithms/Test/SvdTest.cpp b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp
index c46448fc4..b8b995f2b 100644
--- a/src/Magnum/Math/Algorithms/Test/SvdTest.cpp
+++ b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Algorithms/Svd.h"
 
diff --git a/src/Magnum/Math/Angle.h b/src/Magnum/Math/Angle.h
index 9fa9a4617..e76a02c69 100644
--- a/src/Magnum/Math/Angle.h
+++ b/src/Magnum/Math/Angle.h
@@ -28,8 +28,8 @@
  * @brief Class Magnum::Math::Deg, Magnum::Math::Rad and related operators.
  */
 
-#include <Utility/Debug.h>
-#include <corradeCompatibility.h>
+#include <Corrade/configure.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Math/Constants.h"
 #include "Math/Math.h"
diff --git a/src/Magnum/Math/BoolVector.h b/src/Magnum/Math/BoolVector.h
index 9866ee114..dca661894 100644
--- a/src/Magnum/Math/BoolVector.h
+++ b/src/Magnum/Math/BoolVector.h
@@ -28,8 +28,8 @@
  * @brief Class Magnum::Math::BoolVector
  */
 
-#include <Utility/Debug.h>
-#include <corradeCompatibility.h>
+#include <Corrade/configure.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Types.h"
 
diff --git a/src/Magnum/Math/Complex.h b/src/Magnum/Math/Complex.h
index 88f2338f7..6c992a677 100644
--- a/src/Magnum/Math/Complex.h
+++ b/src/Magnum/Math/Complex.h
@@ -29,8 +29,8 @@
  */
 
 #include <limits>
-#include <Utility/Assert.h>
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Math/Matrix.h"
 #include "Math/Vector2.h"
diff --git a/src/Magnum/Math/Dual.h b/src/Magnum/Math/Dual.h
index 5d5e4948a..9cb42afa6 100644
--- a/src/Magnum/Math/Dual.h
+++ b/src/Magnum/Math/Dual.h
@@ -29,7 +29,7 @@
  */
 
 #include <cmath>
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Math/TypeTraits.h"
 
diff --git a/src/Magnum/Math/Geometry/Rectangle.h b/src/Magnum/Math/Geometry/Rectangle.h
index 3a0d66462..bf44dfd7e 100644
--- a/src/Magnum/Math/Geometry/Rectangle.h
+++ b/src/Magnum/Math/Geometry/Rectangle.h
@@ -32,7 +32,7 @@
 #include "Math/Range.h"
 
 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Utility/Macros.h>
+#include <Corrade/Utility/Macros.h>
 
 namespace Magnum { namespace Math { namespace Geometry {
 
diff --git a/src/Magnum/Math/Geometry/Test/DistanceTest.cpp b/src/Magnum/Math/Geometry/Test/DistanceTest.cpp
index f60c94931..5d658d4d2 100644
--- a/src/Magnum/Math/Geometry/Test/DistanceTest.cpp
+++ b/src/Magnum/Math/Geometry/Test/DistanceTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <limits>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Constants.h"
 #include "Math/Geometry/Distance.h"
diff --git a/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp b/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp
index db23f96f8..551a5a5f6 100644
--- a/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp
+++ b/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <limits>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Geometry/Intersection.h"
 
diff --git a/src/Magnum/Math/Math.h b/src/Magnum/Math/Math.h
index 27edab373..762af5290 100644
--- a/src/Magnum/Math/Math.h
+++ b/src/Magnum/Math/Math.h
@@ -29,7 +29,7 @@
  */
 
 #include <cstddef>
-#include <corradeConfigure.h>
+#include <Corrade/configure.h>
 
 #include "Types.h"
 
diff --git a/src/Magnum/Math/Quaternion.h b/src/Magnum/Math/Quaternion.h
index 65c3f9408..cfa6454a6 100644
--- a/src/Magnum/Math/Quaternion.h
+++ b/src/Magnum/Math/Quaternion.h
@@ -29,8 +29,8 @@
  */
 
 #include <cmath>
-#include <Utility/Assert.h>
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Math/TypeTraits.h"
 #include "Math/Matrix.h"
diff --git a/src/Magnum/Math/Test/AngleTest.cpp b/src/Magnum/Math/Test/AngleTest.cpp
index cdc3b3eba..72120aa85 100644
--- a/src/Magnum/Math/Test/AngleTest.cpp
+++ b/src/Magnum/Math/Test/AngleTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Angle.h"
 
diff --git a/src/Magnum/Math/Test/BoolVectorTest.cpp b/src/Magnum/Math/Test/BoolVectorTest.cpp
index 06b7a42e3..72c2e134d 100644
--- a/src/Magnum/Math/Test/BoolVectorTest.cpp
+++ b/src/Magnum/Math/Test/BoolVectorTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/BoolVector.h"
 
diff --git a/src/Magnum/Math/Test/ComplexTest.cpp b/src/Magnum/Math/Test/ComplexTest.cpp
index 181f3a780..ff5d176e0 100644
--- a/src/Magnum/Math/Test/ComplexTest.cpp
+++ b/src/Magnum/Math/Test/ComplexTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Complex.h"
 #include "Math/Matrix3.h"
diff --git a/src/Magnum/Math/Test/ConstantsTest.cpp b/src/Magnum/Math/Test/ConstantsTest.cpp
index 9242453b7..c443b14dc 100644
--- a/src/Magnum/Math/Test/ConstantsTest.cpp
+++ b/src/Magnum/Math/Test/ConstantsTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Constants.h"
 #include "Math/Functions.h"
diff --git a/src/Magnum/Math/Test/DualComplexTest.cpp b/src/Magnum/Math/Test/DualComplexTest.cpp
index 6e6c5d554..a01374061 100644
--- a/src/Magnum/Math/Test/DualComplexTest.cpp
+++ b/src/Magnum/Math/Test/DualComplexTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/DualComplex.h"
 #include "Math/DualQuaternion.h"
diff --git a/src/Magnum/Math/Test/DualQuaternionTest.cpp b/src/Magnum/Math/Test/DualQuaternionTest.cpp
index db7a7e653..27d337256 100644
--- a/src/Magnum/Math/Test/DualQuaternionTest.cpp
+++ b/src/Magnum/Math/Test/DualQuaternionTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/DualQuaternion.h"
 
diff --git a/src/Magnum/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp
index 1bf0c2da7..d5bf78614 100644
--- a/src/Magnum/Math/Test/DualTest.cpp
+++ b/src/Magnum/Math/Test/DualTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Dual.h"
 
diff --git a/src/Magnum/Math/Test/FunctionsTest.cpp b/src/Magnum/Math/Test/FunctionsTest.cpp
index b2dd56187..a72f897f3 100644
--- a/src/Magnum/Math/Test/FunctionsTest.cpp
+++ b/src/Magnum/Math/Test/FunctionsTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Functions.h"
 #include "Math/Vector3.h"
diff --git a/src/Magnum/Math/Test/Matrix3Test.cpp b/src/Magnum/Math/Test/Matrix3Test.cpp
index 255927bfe..39bf78ae1 100644
--- a/src/Magnum/Math/Test/Matrix3Test.cpp
+++ b/src/Magnum/Math/Test/Matrix3Test.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Math/Matrix3.h"
 
diff --git a/src/Magnum/Math/Test/Matrix4Test.cpp b/src/Magnum/Math/Test/Matrix4Test.cpp
index d363351fd..0f5eba0b8 100644
--- a/src/Magnum/Math/Test/Matrix4Test.cpp
+++ b/src/Magnum/Math/Test/Matrix4Test.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Math/Matrix4.h"
 
diff --git a/src/Magnum/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp
index d0940bc9a..6e28cb699 100644
--- a/src/Magnum/Math/Test/MatrixTest.cpp
+++ b/src/Magnum/Math/Test/MatrixTest.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Math/Matrix.h"
 
diff --git a/src/Magnum/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp
index 1d4413861..8130ccf2f 100644
--- a/src/Magnum/Math/Test/QuaternionTest.cpp
+++ b/src/Magnum/Math/Test/QuaternionTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Matrix4.h"
 #include "Math/Quaternion.h"
diff --git a/src/Magnum/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp
index 341d3f8e2..ae54276e8 100644
--- a/src/Magnum/Math/Test/RangeTest.cpp
+++ b/src/Magnum/Math/Test/RangeTest.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Math/Range.h"
 
diff --git a/src/Magnum/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp
index 689ea1fee..445b4573d 100644
--- a/src/Magnum/Math/Test/RectangularMatrixTest.cpp
+++ b/src/Magnum/Math/Test/RectangularMatrixTest.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Math/RectangularMatrix.h"
 
diff --git a/src/Magnum/Math/Test/SwizzleTest.cpp b/src/Magnum/Math/Test/SwizzleTest.cpp
index 19968ca72..476c12dd6 100644
--- a/src/Magnum/Math/Test/SwizzleTest.cpp
+++ b/src/Magnum/Math/Test/SwizzleTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Swizzle.h"
 
diff --git a/src/Magnum/Math/Test/TypeTraitsTest.cpp b/src/Magnum/Math/Test/TypeTraitsTest.cpp
index dd5d0edad..cc2d1ae4d 100644
--- a/src/Magnum/Math/Test/TypeTraitsTest.cpp
+++ b/src/Magnum/Math/Test/TypeTraitsTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <limits>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/TypeTraits.h"
 
diff --git a/src/Magnum/Math/Test/UnitTest.cpp b/src/Magnum/Math/Test/UnitTest.cpp
index d1ce67d48..ec8420b0c 100644
--- a/src/Magnum/Math/Test/UnitTest.cpp
+++ b/src/Magnum/Math/Test/UnitTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Unit.h"
 
diff --git a/src/Magnum/Math/Test/Vector2Test.cpp b/src/Magnum/Math/Test/Vector2Test.cpp
index 69c67c879..6e782bb6d 100644
--- a/src/Magnum/Math/Test/Vector2Test.cpp
+++ b/src/Magnum/Math/Test/Vector2Test.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Math/Vector3.h" /* Vector3 used in Vector2::cross() */
 
diff --git a/src/Magnum/Math/Test/Vector3Test.cpp b/src/Magnum/Math/Test/Vector3Test.cpp
index 2611283e4..34c37a4ac 100644
--- a/src/Magnum/Math/Test/Vector3Test.cpp
+++ b/src/Magnum/Math/Test/Vector3Test.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Math/Vector3.h"
 
diff --git a/src/Magnum/Math/Test/Vector4Test.cpp b/src/Magnum/Math/Test/Vector4Test.cpp
index e5480f870..91b32f8f9 100644
--- a/src/Magnum/Math/Test/Vector4Test.cpp
+++ b/src/Magnum/Math/Test/Vector4Test.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Math/Vector4.h"
 
diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp
index a09684da3..1d8bc01fe 100644
--- a/src/Magnum/Math/Test/VectorTest.cpp
+++ b/src/Magnum/Math/Test/VectorTest.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Math/Vector.h"
 
diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h
index a8ec1e645..42a00a239 100644
--- a/src/Magnum/Math/Vector.h
+++ b/src/Magnum/Math/Vector.h
@@ -30,9 +30,9 @@
 
 #include <cmath>
 #include <limits>
-#include <Utility/Assert.h>
-#include <Utility/Debug.h>
-#include <Utility/ConfigurationValue.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Debug.h>
+#include <Corrade/Utility/ConfigurationValue.h>
 
 #include "Math/Angle.h"
 #include "Math/BoolVector.h"
diff --git a/src/Magnum/Mesh.cpp b/src/Magnum/Mesh.cpp
index f8da0e95e..9ea11a1d8 100644
--- a/src/Magnum/Mesh.cpp
+++ b/src/Magnum/Mesh.cpp
@@ -24,7 +24,7 @@
 
 #include "Mesh.h"
 
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Buffer.h"
 #include "Context.h"
diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h
index 068da10e6..738c52b8b 100644
--- a/src/Magnum/Mesh.h
+++ b/src/Magnum/Mesh.h
@@ -29,7 +29,7 @@
  */
 
 #include <vector>
-#include <Utility/ConfigurationValue.h>
+#include <Corrade/Utility/ConfigurationValue.h>
 
 #include "AbstractShaderProgram.h"
 
diff --git a/src/Magnum/MeshTools/CompressIndices.cpp b/src/Magnum/MeshTools/CompressIndices.cpp
index ed2886d36..7c726c42f 100644
--- a/src/Magnum/MeshTools/CompressIndices.cpp
+++ b/src/Magnum/MeshTools/CompressIndices.cpp
@@ -26,7 +26,7 @@
 
 #include <cstring>
 #include <algorithm>
-#include <Containers/Array.h>
+#include <Corrade/Containers/Array.h>
 
 #include "Math/Functions.h"
 #include "Buffer.h"
diff --git a/src/Magnum/MeshTools/RemoveDuplicates.h b/src/Magnum/MeshTools/RemoveDuplicates.h
index 8b1ac58f2..e1403fd6e 100644
--- a/src/Magnum/MeshTools/RemoveDuplicates.h
+++ b/src/Magnum/MeshTools/RemoveDuplicates.h
@@ -31,7 +31,7 @@
 #include <limits>
 #include <unordered_map>
 #include <vector>
-#include <Utility/MurmurHash2.h>
+#include <Corrade/Utility/MurmurHash2.h>
 
 #include "Math/Functions.h"
 #include "Magnum.h"
diff --git a/src/Magnum/MeshTools/Subdivide.h b/src/Magnum/MeshTools/Subdivide.h
index 33b8f8517..a4c78fd15 100644
--- a/src/Magnum/MeshTools/Subdivide.h
+++ b/src/Magnum/MeshTools/Subdivide.h
@@ -29,7 +29,7 @@
  */
 
 #include <vector>
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 namespace Magnum { namespace MeshTools {
 
diff --git a/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp
index cf9cd103b..de139add4 100644
--- a/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp
+++ b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp
@@ -24,7 +24,7 @@
 
 #include <functional>
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Types.h"
 #include "MeshTools/CombineIndexedArrays.h"
diff --git a/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp
index 47e4b03cd..49be7308d 100644
--- a/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp
+++ b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp
@@ -22,9 +22,9 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Containers/Array.h>
-#include <TestSuite/Tester.h>
-#include <Utility/Endianness.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Endianness.h>
 
 #include "MeshTools/CompressIndices.h"
 
diff --git a/src/Magnum/MeshTools/Test/DuplicateTest.cpp b/src/Magnum/MeshTools/Test/DuplicateTest.cpp
index 9fe06065f..14736b9f1 100644
--- a/src/Magnum/MeshTools/Test/DuplicateTest.cpp
+++ b/src/Magnum/MeshTools/Test/DuplicateTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "MeshTools/Duplicate.h"
 #include "Magnum.h"
diff --git a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp
index fb6106f47..140388963 100644
--- a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp
+++ b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Vector3.h"
 #include "MeshTools/FlipNormals.h"
diff --git a/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp b/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp
index 9e3f747d9..4dbd95b94 100644
--- a/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp
+++ b/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Vector3.h"
 #include "MeshTools/GenerateFlatNormals.h"
diff --git a/src/Magnum/MeshTools/Test/InterleaveTest.cpp b/src/Magnum/MeshTools/Test/InterleaveTest.cpp
index 036fe2e8e..4ab6712c9 100644
--- a/src/Magnum/MeshTools/Test/InterleaveTest.cpp
+++ b/src/Magnum/MeshTools/Test/InterleaveTest.cpp
@@ -23,10 +23,10 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Endianness.h>
+#include <Corrade/Utility/Debug.h>
 
-#include "Utility/Endianness.h"
-#include "Utility/Debug.h"
 #include "MeshTools/Interleave.h"
 
 namespace Magnum { namespace MeshTools { namespace Test {
diff --git a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
index 2f40c9038..9966be31a 100644
--- a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
+++ b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "MeshTools/RemoveDuplicates.h"
 
diff --git a/src/Magnum/MeshTools/Test/SubdivideTest.cpp b/src/Magnum/MeshTools/Test/SubdivideTest.cpp
index 2114b70c6..bd6afe8fd 100644
--- a/src/Magnum/MeshTools/Test/SubdivideTest.cpp
+++ b/src/Magnum/MeshTools/Test/SubdivideTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "MeshTools/RemoveDuplicates.h"
 #include "MeshTools/Subdivide.h"
diff --git a/src/Magnum/MeshTools/Test/TipsifyTest.cpp b/src/Magnum/MeshTools/Test/TipsifyTest.cpp
index 61da9fd17..8c0f5b35a 100644
--- a/src/Magnum/MeshTools/Test/TipsifyTest.cpp
+++ b/src/Magnum/MeshTools/Test/TipsifyTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Magnum.h"
 #include "MeshTools/Tipsify.h"
diff --git a/src/Magnum/MeshTools/Test/TransformTest.cpp b/src/Magnum/MeshTools/Test/TransformTest.cpp
index ab0d46a68..5bbc0b8bc 100644
--- a/src/Magnum/MeshTools/Test/TransformTest.cpp
+++ b/src/Magnum/MeshTools/Test/TransformTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <array>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Matrix3.h"
 #include "Magnum.h"
diff --git a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h b/src/Magnum/MeshTools/magnumMeshToolsVisibility.h
index 476d8f3a5..988c8a90e 100644
--- a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h
+++ b/src/Magnum/MeshTools/magnumMeshToolsVisibility.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "magnumConfigure.h"
 
diff --git a/src/Magnum/OpenGL.h b/src/Magnum/OpenGL.h
index b40af2f11..a2ca1416f 100644
--- a/src/Magnum/OpenGL.h
+++ b/src/Magnum/OpenGL.h
@@ -28,7 +28,8 @@
  * @brief OpenGL headers
  */
 
-#include <corradeConfigure.h>
+#include <Corrade/configure.h>
+
 #include "magnumConfigure.h"
 
 /** @todo Remove NaCl workaround when not needed */
diff --git a/src/Magnum/Platform/AbstractXApplication.cpp b/src/Magnum/Platform/AbstractXApplication.cpp
index 38d5606f9..26a2c553a 100644
--- a/src/Magnum/Platform/AbstractXApplication.cpp
+++ b/src/Magnum/Platform/AbstractXApplication.cpp
@@ -24,7 +24,7 @@
 
 #include "AbstractXApplication.h"
 
-#include <Utility/utilities.h>
+#include <Corrade/Utility/utilities.h>
 
 #include "Context.h"
 #include "Version.h"
diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h
index 62a4407d8..81bca66ef 100644
--- a/src/Magnum/Platform/AbstractXApplication.h
+++ b/src/Magnum/Platform/AbstractXApplication.h
@@ -28,9 +28,7 @@
  * @brief Class @ref Magnum::Platform::AbstractXApplication
  */
 
-#include <Containers/EnumSet.h>
-
-#include "Magnum.h"
+#include <Corrade/Containers/EnumSet.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -40,6 +38,7 @@
 #undef None
 #undef Status
 
+#include "Magnum.h"
 #include "Math/Vector2.h"
 
 namespace Magnum {
diff --git a/src/Magnum/Platform/Implementation/EglContextHandler.cpp b/src/Magnum/Platform/Implementation/EglContextHandler.cpp
index 121af16f8..b17233341 100644
--- a/src/Magnum/Platform/Implementation/EglContextHandler.cpp
+++ b/src/Magnum/Platform/Implementation/EglContextHandler.cpp
@@ -26,7 +26,7 @@
 
 #include <tuple>
 #include <EGL/eglext.h>
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Context.h"
 #include "Version.h"
diff --git a/src/Magnum/Platform/Implementation/EglContextHandler.h b/src/Magnum/Platform/Implementation/EglContextHandler.h
index 94724da66..1b5640c19 100644
--- a/src/Magnum/Platform/Implementation/EglContextHandler.h
+++ b/src/Magnum/Platform/Implementation/EglContextHandler.h
@@ -30,15 +30,14 @@
 #define SUPPORT_X11 // OpenGL ES on BeagleBoard needs this (?)
 #endif
 #include <EGL/egl.h>
-
 /* undef Xlib nonsense to avoid conflicts */
 #undef None
 
+#include <Corrade/compatibility.h>
+
 #include "Platform/AbstractXApplication.h"
 #include "Platform/Implementation/AbstractContextHandler.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace Platform { namespace Implementation {
 
 #ifndef DOXYGEN_GENERATING_OUTPUT
diff --git a/src/Magnum/Platform/Implementation/GlxContextHandler.cpp b/src/Magnum/Platform/Implementation/GlxContextHandler.cpp
index bc90befc3..08ed88616 100644
--- a/src/Magnum/Platform/Implementation/GlxContextHandler.cpp
+++ b/src/Magnum/Platform/Implementation/GlxContextHandler.cpp
@@ -27,7 +27,7 @@
 #include <cstdlib>
 #include <tuple>
 #include <GL/glxext.h>
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Context.h"
 #include "Version.h"
diff --git a/src/Magnum/Platform/Implementation/GlxContextHandler.h b/src/Magnum/Platform/Implementation/GlxContextHandler.h
index a1e99f90e..a4f9ff66b 100644
--- a/src/Magnum/Platform/Implementation/GlxContextHandler.h
+++ b/src/Magnum/Platform/Implementation/GlxContextHandler.h
@@ -33,11 +33,11 @@
 #undef None
 #undef Status
 
+#include <Corrade/compatibility.h>
+
 #include "Platform/AbstractXApplication.h"
 #include "Platform/Implementation/AbstractContextHandler.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace Platform { namespace Implementation {
 
 /**
diff --git a/src/Magnum/Platform/NaClApplication.cpp b/src/Magnum/Platform/NaClApplication.cpp
index 9272fc581..f31bfd688 100644
--- a/src/Magnum/Platform/NaClApplication.cpp
+++ b/src/Magnum/Platform/NaClApplication.cpp
@@ -27,7 +27,7 @@
 #include <ppapi/cpp/graphics_3d.h>
 #include <ppapi/cpp/fullscreen.h>
 #include <ppapi/cpp/completion_callback.h>
-#include <Utility/NaClStreamBuffer.h>
+#include <Corrade/Utility/NaClStreamBuffer.h>
 
 #include "Context.h"
 #include "Platform/ScreenedApplication.hpp"
diff --git a/src/Magnum/Platform/NaClApplication.h b/src/Magnum/Platform/NaClApplication.h
index 4dc6088a3..3aa022531 100644
--- a/src/Magnum/Platform/NaClApplication.h
+++ b/src/Magnum/Platform/NaClApplication.h
@@ -29,7 +29,8 @@
  */
 
 #include <string>
-#include <Containers/EnumSet.h>
+#include <Corrade/compatibility.h>
+#include <Corrade/Containers/EnumSet.h>
 #include <ppapi/cpp/input_event.h>
 #include <ppapi/cpp/instance.h>
 #include <ppapi/cpp/module.h>
@@ -41,8 +42,6 @@
 #include "Math/Vector2.h"
 #include "Magnum.h"
 
-#include "corradeCompatibility.h"
-
 namespace pp {
     class Graphics3D;
     class Fullscreen;
diff --git a/src/Magnum/Platform/Screen.h b/src/Magnum/Platform/Screen.h
index 805fbd2f2..330920eff 100644
--- a/src/Magnum/Platform/Screen.h
+++ b/src/Magnum/Platform/Screen.h
@@ -28,7 +28,7 @@
  * @brief Class @ref Magnum::Platform::BasicScreen
  */
 
-#include <Containers/EnumSet.h>
+#include <Corrade/Containers/EnumSet.h>
 
 #include "Platform/ScreenedApplication.h"
 
diff --git a/src/Magnum/Platform/ScreenedApplication.h b/src/Magnum/Platform/ScreenedApplication.h
index fc7e0a468..43db79d4a 100644
--- a/src/Magnum/Platform/ScreenedApplication.h
+++ b/src/Magnum/Platform/ScreenedApplication.h
@@ -28,9 +28,9 @@
  * @brief Class @ref Magnum::Platform::BasicScreenedApplication
  */
 
-#include <Containers/LinkedList.h>
-#include <Magnum.h>
+#include <Corrade/Containers/LinkedList.h>
 
+#include "Magnum.h"
 #include "Platform/Platform.h"
 
 namespace Magnum { namespace Platform {
diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h
index c7002f859..76934c8fa 100644
--- a/src/Magnum/Platform/Sdl2Application.h
+++ b/src/Magnum/Platform/Sdl2Application.h
@@ -28,8 +28,8 @@
  * @brief Class @ref Magnum::Platform::Sdl2Application
  */
 
-#include <Containers/EnumSet.h>
-#include <Corrade.h>
+#include <Corrade/Containers/EnumSet.h>
+#include <Corrade/Corrade.h>
 
 #include "Platform/Platform.h"
 #include "Math/Vector2.h"
@@ -42,7 +42,7 @@
 #include <SDL_scancode.h>
 
 #ifdef MAGNUM_BUILD_DEPRECATED
-#include <Utility/Macros.h>
+#include <Corrade/Utility/Macros.h>
 #endif
 
 namespace Magnum {
diff --git a/src/Magnum/Platform/WindowlessGlxApplication.cpp b/src/Magnum/Platform/WindowlessGlxApplication.cpp
index a84592ad1..ee2ddd6c7 100644
--- a/src/Magnum/Platform/WindowlessGlxApplication.cpp
+++ b/src/Magnum/Platform/WindowlessGlxApplication.cpp
@@ -24,8 +24,8 @@
 
 #include "WindowlessGlxApplication.h"
 
-#include <Utility/Assert.h>
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Context.h"
 
diff --git a/src/Magnum/Platform/WindowlessNaClApplication.cpp b/src/Magnum/Platform/WindowlessNaClApplication.cpp
index 22e9eb1d6..3e9ca18ed 100644
--- a/src/Magnum/Platform/WindowlessNaClApplication.cpp
+++ b/src/Magnum/Platform/WindowlessNaClApplication.cpp
@@ -26,8 +26,8 @@
 
 #include <ppapi/cpp/graphics_3d.h>
 #include <ppapi/cpp/completion_callback.h>
-#include <Utility/Assert.h>
-#include <Utility/NaClStreamBuffer.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/NaClStreamBuffer.h>
 
 #include "Context.h"
 
diff --git a/src/Magnum/Platform/WindowlessNaClApplication.h b/src/Magnum/Platform/WindowlessNaClApplication.h
index a6f2a55ef..b2552b8a3 100644
--- a/src/Magnum/Platform/WindowlessNaClApplication.h
+++ b/src/Magnum/Platform/WindowlessNaClApplication.h
@@ -29,7 +29,8 @@
  */
 
 #include <string>
-#include <Containers/EnumSet.h>
+#include <Corrade/compatibility.h>
+#include <Corrade/Containers/EnumSet.h>
 #include <ppapi/cpp/instance.h>
 #include <ppapi/cpp/module.h>
 #include <ppapi/cpp/graphics_3d_client.h>
@@ -37,8 +38,6 @@
 
 #include "Magnum.h"
 
-#include "corradeCompatibility.h"
-
 namespace pp {
     class Graphics3D;
     class Fullscreen;
diff --git a/src/Magnum/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp
index adac9c2fb..891b9e5e3 100644
--- a/src/Magnum/Platform/magnum-info.cpp
+++ b/src/Magnum/Platform/magnum-info.cpp
@@ -22,11 +22,11 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Arguments.h>
-#include <Utility/Debug.h>
-#include <corradeCompatibility.h>
+#include <Corrade/Utility/Arguments.h>
+#include <Corrade/Utility/Debug.h>
+#include <Corrade/compatibility.h>
 #ifdef CORRADE_TARGET_NACL
-#include <Utility/NaClStreamBuffer.h>
+#include <Corrade/Utility/NaClStreamBuffer.h>
 #endif
 
 #include "AbstractShaderProgram.h"
diff --git a/src/Magnum/Primitives/Cylinder.h b/src/Magnum/Primitives/Cylinder.h
index bc95ad19a..bfe3ba5c7 100644
--- a/src/Magnum/Primitives/Cylinder.h
+++ b/src/Magnum/Primitives/Cylinder.h
@@ -28,7 +28,7 @@
  * @brief Class Magnum::Primitives::Cylinder
  */
 
-#include <Containers/EnumSet.h>
+#include <Corrade/Containers/EnumSet.h>
 
 #include "Magnum.h"
 #include "Primitives/magnumPrimitivesVisibility.h"
diff --git a/src/Magnum/Primitives/Test/CapsuleTest.cpp b/src/Magnum/Primitives/Test/CapsuleTest.cpp
index 23efaba1e..9fe344b35 100644
--- a/src/Magnum/Primitives/Test/CapsuleTest.cpp
+++ b/src/Magnum/Primitives/Test/CapsuleTest.cpp
@@ -25,8 +25,8 @@
 /* Less precision */
 #define FLOAT_EQUALITY_PRECISION 1.0e-5
 
-#include <TestSuite/Tester.h>
-#include <TestSuite/Compare/Container.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Math/Vector3.h"
 #include "Trade/MeshData2D.h"
diff --git a/src/Magnum/Primitives/Test/CircleTest.cpp b/src/Magnum/Primitives/Test/CircleTest.cpp
index 4395086f3..b1a77618a 100644
--- a/src/Magnum/Primitives/Test/CircleTest.cpp
+++ b/src/Magnum/Primitives/Test/CircleTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Vector2.h"
 #include "Primitives/Circle.h"
diff --git a/src/Magnum/Primitives/Test/CylinderTest.cpp b/src/Magnum/Primitives/Test/CylinderTest.cpp
index 10bc34add..03e5a64f3 100644
--- a/src/Magnum/Primitives/Test/CylinderTest.cpp
+++ b/src/Magnum/Primitives/Test/CylinderTest.cpp
@@ -22,8 +22,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
-#include <TestSuite/Compare/Container.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Math/Vector3.h"
 #include "Primitives/Cylinder.h"
diff --git a/src/Magnum/Primitives/Test/IcosphereTest.cpp b/src/Magnum/Primitives/Test/IcosphereTest.cpp
index e6f6d13db..59ed877f9 100644
--- a/src/Magnum/Primitives/Test/IcosphereTest.cpp
+++ b/src/Magnum/Primitives/Test/IcosphereTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Vector3.h"
 #include "Primitives/Icosphere.h"
diff --git a/src/Magnum/Primitives/Test/UVSphereTest.cpp b/src/Magnum/Primitives/Test/UVSphereTest.cpp
index f4df1a54e..7be1c2cca 100644
--- a/src/Magnum/Primitives/Test/UVSphereTest.cpp
+++ b/src/Magnum/Primitives/Test/UVSphereTest.cpp
@@ -22,8 +22,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
-#include <TestSuite/Compare/Container.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Math/Vector3.h"
 #include "Primitives/UVSphere.h"
diff --git a/src/Magnum/Primitives/magnumPrimitivesVisibility.h b/src/Magnum/Primitives/magnumPrimitivesVisibility.h
index 770730353..a3a60ec46 100644
--- a/src/Magnum/Primitives/magnumPrimitivesVisibility.h
+++ b/src/Magnum/Primitives/magnumPrimitivesVisibility.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "magnumConfigure.h"
 
diff --git a/src/Magnum/Query.cpp b/src/Magnum/Query.cpp
index d847bb635..da4460996 100644
--- a/src/Magnum/Query.cpp
+++ b/src/Magnum/Query.cpp
@@ -24,7 +24,7 @@
 
 #include "Query.h"
 
-#include <Utility/Assert.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "Context.h"
 #include "Implementation/DebugState.h"
diff --git a/src/Magnum/Query.h b/src/Magnum/Query.h
index 1d1b4bf52..9237efc32 100644
--- a/src/Magnum/Query.h
+++ b/src/Magnum/Query.h
@@ -28,7 +28,7 @@
  * @brief Class @ref Magnum::AbstractQuery, @ref Magnum::PrimitiveQuery, @ref Magnum::SampleQuery, @ref Magnum::TimeQuery
  */
 
-#include <Utility/Assert.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "AbstractObject.h"
 #include "magnumConfigure.h"
diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h
index f9254b114..e95dae180 100644
--- a/src/Magnum/Renderer.h
+++ b/src/Magnum/Renderer.h
@@ -28,7 +28,7 @@
  * @brief Class Magnum::Renderer
  */
 
-#include <Containers/EnumSet.h>
+#include <Corrade/Containers/EnumSet.h>
 
 #include "Magnum.h"
 #include "OpenGL.h"
diff --git a/src/Magnum/Resource.h b/src/Magnum/Resource.h
index 591fb7014..cf33afe1c 100644
--- a/src/Magnum/Resource.h
+++ b/src/Magnum/Resource.h
@@ -28,8 +28,8 @@
  * @brief Class Magnum::ResourceKey, Magnum::Resource, enum Magnum::ResourceState
  */
 
-#include <Utility/Assert.h>
-#include <Utility/MurmurHash2.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/MurmurHash2.h>
 
 #include "Magnum.h"
 
diff --git a/src/Magnum/Sampler.cpp b/src/Magnum/Sampler.cpp
index 9e6a9311e..6b0452f33 100644
--- a/src/Magnum/Sampler.cpp
+++ b/src/Magnum/Sampler.cpp
@@ -24,7 +24,7 @@
 
 #include "Sampler.h"
 
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Context.h"
 #include "Implementation/State.h"
diff --git a/src/Magnum/SceneGraph/AbstractFeature.h b/src/Magnum/SceneGraph/AbstractFeature.h
index 8f2a585c5..58e63433e 100644
--- a/src/Magnum/SceneGraph/AbstractFeature.h
+++ b/src/Magnum/SceneGraph/AbstractFeature.h
@@ -28,8 +28,8 @@
  * @brief Class @ref Magnum::SceneGraph::AbstractFeature, alias @ref Magnum::SceneGraph::AbstractBasicFeature2D, @ref Magnum::SceneGraph::AbstractBasicFeature3D, typedef @ref Magnum::SceneGraph::AbstractFeature2D, @ref Magnum::SceneGraph::AbstractFeature3D, enum @ref Magnum::SceneGraph::CachedTransformation, enum set @ref Magnum::SceneGraph::CachedTransformations
  */
 
-#include <Containers/EnumSet.h>
-#include <Containers/LinkedList.h>
+#include <Corrade/Containers/EnumSet.h>
+#include <Corrade/Containers/LinkedList.h>
 
 #include "Magnum.h"
 #include "SceneGraph/AbstractObject.h"
diff --git a/src/Magnum/SceneGraph/AbstractObject.h b/src/Magnum/SceneGraph/AbstractObject.h
index ffe781a70..24a0273c8 100644
--- a/src/Magnum/SceneGraph/AbstractObject.h
+++ b/src/Magnum/SceneGraph/AbstractObject.h
@@ -29,7 +29,7 @@
  */
 
 #include <vector>
-#include <Containers/LinkedList.h>
+#include <Corrade/Containers/LinkedList.h>
 
 #include "DimensionTraits.h"
 #include "SceneGraph.h"
diff --git a/src/Magnum/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h
index efa7acb03..34359ac05 100644
--- a/src/Magnum/SceneGraph/FeatureGroup.h
+++ b/src/Magnum/SceneGraph/FeatureGroup.h
@@ -29,7 +29,7 @@
  */
 
 #include <vector>
-#include <Utility/Assert.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "SceneGraph/SceneGraph.h"
 #include "SceneGraph/magnumSceneGraphVisibility.h"
diff --git a/src/Magnum/SceneGraph/Object.h b/src/Magnum/SceneGraph/Object.h
index 903101e64..6832cee2e 100644
--- a/src/Magnum/SceneGraph/Object.h
+++ b/src/Magnum/SceneGraph/Object.h
@@ -28,7 +28,7 @@
  * @brief Class Magnum::SceneGraph::Object
  */
 
-#include <Containers/EnumSet.h>
+#include <Corrade/Containers/EnumSet.h>
 
 #include "AbstractFeature.h"
 #include "AbstractObject.h"
diff --git a/src/Magnum/SceneGraph/SceneGraph.h b/src/Magnum/SceneGraph/SceneGraph.h
index e8f657935..0370b6b5f 100644
--- a/src/Magnum/SceneGraph/SceneGraph.h
+++ b/src/Magnum/SceneGraph/SceneGraph.h
@@ -28,9 +28,9 @@
  * @brief Forward declarations for Magnum::SceneGraph namespace
  */
 
-#include "Types.h"
+#include <Corrade/compatibility.h>
 
-#include "corradeCompatibility.h"
+#include "Types.h"
 
 namespace Magnum { namespace SceneGraph {
 
diff --git a/src/Magnum/SceneGraph/Test/AnimableTest.cpp b/src/Magnum/SceneGraph/Test/AnimableTest.cpp
index eb9c9eb7d..3dafc0ead 100644
--- a/src/Magnum/SceneGraph/Test/AnimableTest.cpp
+++ b/src/Magnum/SceneGraph/Test/AnimableTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/Animable.h"
 #include "SceneGraph/AnimableGroup.h"
diff --git a/src/Magnum/SceneGraph/Test/CameraTest.cpp b/src/Magnum/SceneGraph/Test/CameraTest.cpp
index 14ed3c555..d21dec3d2 100644
--- a/src/Magnum/SceneGraph/Test/CameraTest.cpp
+++ b/src/Magnum/SceneGraph/Test/CameraTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/AbstractCamera.hpp" /* only for aspectRatioFix(), so it doesn't have to be exported */
 #include "SceneGraph/Camera2D.h"
diff --git a/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp
index 5d7417065..4acfc2aba 100644
--- a/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp
+++ b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/DualComplexTransformation.h"
 #include "SceneGraph/Scene.h"
diff --git a/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp
index 72d5d0f41..6cc743870 100644
--- a/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp
+++ b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/DualQuaternionTransformation.h"
 #include "SceneGraph/Scene.h"
diff --git a/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp
index b1408956e..607f0ed3c 100644
--- a/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp
+++ b/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/MatrixTransformation2D.h"
 #include "SceneGraph/Scene.h"
diff --git a/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp
index 66240a318..44fe948a4 100644
--- a/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp
+++ b/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/MatrixTransformation3D.h"
 #include "SceneGraph/Scene.h"
diff --git a/src/Magnum/SceneGraph/Test/ObjectTest.cpp b/src/Magnum/SceneGraph/Test/ObjectTest.cpp
index 0dbbefe7a..82375a07a 100644
--- a/src/Magnum/SceneGraph/Test/ObjectTest.cpp
+++ b/src/Magnum/SceneGraph/Test/ObjectTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/MatrixTransformation3D.h"
 #include "SceneGraph/Scene.h"
diff --git a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
index f33537c2f..8aaa7ba1b 100644
--- a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
+++ b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/RigidMatrixTransformation2D.h"
 #include "SceneGraph/Scene.h"
diff --git a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
index d6cf466a7..f0ce9f7a9 100644
--- a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
+++ b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/RigidMatrixTransformation3D.h"
 #include "SceneGraph/Scene.h"
diff --git a/src/Magnum/SceneGraph/Test/SceneTest.cpp b/src/Magnum/SceneGraph/Test/SceneTest.cpp
index 65f8dcb60..ccb6676e7 100644
--- a/src/Magnum/SceneGraph/Test/SceneTest.cpp
+++ b/src/Magnum/SceneGraph/Test/SceneTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/MatrixTransformation3D.h"
 #include "SceneGraph/Scene.h"
diff --git a/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp
index de012ff81..e3ca42edf 100644
--- a/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp
+++ b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "SceneGraph/Object.hpp"
 #include "SceneGraph/TranslationTransformation.h"
diff --git a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h b/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h
index 9ffc7422c..4f6d10dd0 100644
--- a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h
+++ b/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "magnumConfigure.h"
 
diff --git a/src/Magnum/Shader.cpp b/src/Magnum/Shader.cpp
index 22a204b49..842c5d663 100644
--- a/src/Magnum/Shader.cpp
+++ b/src/Magnum/Shader.cpp
@@ -24,9 +24,9 @@
 
 #include "Shader.h"
 
-#include <Containers/Array.h>
-#include <Utility/Assert.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Shaders/DistanceFieldVector.cpp b/src/Magnum/Shaders/DistanceFieldVector.cpp
index fac5a9b88..fe846b59c 100644
--- a/src/Magnum/Shaders/DistanceFieldVector.cpp
+++ b/src/Magnum/Shaders/DistanceFieldVector.cpp
@@ -24,7 +24,7 @@
 
 #include "DistanceFieldVector.h"
 
-#include <Utility/Resource.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Shaders/Flat.cpp b/src/Magnum/Shaders/Flat.cpp
index 97ef51c2f..058b7260e 100644
--- a/src/Magnum/Shaders/Flat.cpp
+++ b/src/Magnum/Shaders/Flat.cpp
@@ -24,7 +24,7 @@
 
 #include "Flat.h"
 
-#include <Utility/Resource.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Shaders/MeshVisualizer.cpp b/src/Magnum/Shaders/MeshVisualizer.cpp
index bc7dcbbac..4a557d1a3 100644
--- a/src/Magnum/Shaders/MeshVisualizer.cpp
+++ b/src/Magnum/Shaders/MeshVisualizer.cpp
@@ -24,7 +24,7 @@
 
 #include "MeshVisualizer.h"
 
-#include <Utility/Resource.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Shaders/Phong.cpp b/src/Magnum/Shaders/Phong.cpp
index 78f0f844f..e33cfe27e 100644
--- a/src/Magnum/Shaders/Phong.cpp
+++ b/src/Magnum/Shaders/Phong.cpp
@@ -24,7 +24,7 @@
 
 #include "Phong.h"
 
-#include <Utility/Resource.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Shaders/Vector.cpp b/src/Magnum/Shaders/Vector.cpp
index c2895bdc6..2069e3671 100644
--- a/src/Magnum/Shaders/Vector.cpp
+++ b/src/Magnum/Shaders/Vector.cpp
@@ -24,7 +24,7 @@
 
 #include "Vector.h"
 
-#include <Utility/Resource.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Shaders/VertexColor.cpp b/src/Magnum/Shaders/VertexColor.cpp
index ce36675d6..443b5841d 100644
--- a/src/Magnum/Shaders/VertexColor.cpp
+++ b/src/Magnum/Shaders/VertexColor.cpp
@@ -24,7 +24,7 @@
 
 #include "VertexColor.h"
 
-#include <Utility/Resource.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Shaders/magnumShadersResourceImport.hpp b/src/Magnum/Shaders/magnumShadersResourceImport.hpp
index 419601905..2235ca5f0 100644
--- a/src/Magnum/Shaders/magnumShadersResourceImport.hpp
+++ b/src/Magnum/Shaders/magnumShadersResourceImport.hpp
@@ -27,8 +27,8 @@
 #include "magnumConfigure.h"
 
 #ifdef MAGNUM_BUILD_STATIC
-#include <Utility/Resource.h>
-#include <Utility/Macros.h>
+#include <Corrade/Utility/Resource.h>
+#include <Corrade/Utility/Macros.h>
 
 static int magnumShadersResourceImport() {
     CORRADE_RESOURCE_INITIALIZE(MagnumShaders_RCS)
diff --git a/src/Magnum/Shaders/magnumShadersVisibility.h b/src/Magnum/Shaders/magnumShadersVisibility.h
index a42810511..202006b11 100644
--- a/src/Magnum/Shaders/magnumShadersVisibility.h
+++ b/src/Magnum/Shaders/magnumShadersVisibility.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "magnumConfigure.h"
 
diff --git a/src/Magnum/Shapes/AbstractShape.cpp b/src/Magnum/Shapes/AbstractShape.cpp
index f6cee4d27..a6e25edc8 100644
--- a/src/Magnum/Shapes/AbstractShape.cpp
+++ b/src/Magnum/Shapes/AbstractShape.cpp
@@ -24,7 +24,7 @@
 
 #include "AbstractShape.h"
 
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 #include "Shapes/ShapeGroup.h"
 #include "Shapes/Implementation/CollisionDispatch.h"
diff --git a/src/Magnum/Shapes/Composition.cpp b/src/Magnum/Shapes/Composition.cpp
index 456071772..141937eb7 100644
--- a/src/Magnum/Shapes/Composition.cpp
+++ b/src/Magnum/Shapes/Composition.cpp
@@ -25,7 +25,7 @@
 #include "Composition.h"
 
 #include <algorithm>
-#include <Utility/Assert.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "Shapes/Implementation/CollisionDispatch.h"
 
diff --git a/src/Magnum/Shapes/Composition.h b/src/Magnum/Shapes/Composition.h
index c07768397..727b24ad4 100644
--- a/src/Magnum/Shapes/Composition.h
+++ b/src/Magnum/Shapes/Composition.h
@@ -30,8 +30,8 @@
 
 #include <type_traits>
 #include <utility>
-#include <Containers/Array.h>
-#include <Utility/Assert.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "DimensionTraits.h"
 #include "Shapes/Shapes.h"
diff --git a/src/Magnum/Shapes/Test/BoxTest.cpp b/src/Magnum/Shapes/Test/BoxTest.cpp
index 1be8e1c71..53140f695 100644
--- a/src/Magnum/Shapes/Test/BoxTest.cpp
+++ b/src/Magnum/Shapes/Test/BoxTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Matrix4.h"
 #include "Magnum.h"
diff --git a/src/Magnum/Shapes/Test/CollisionTest.cpp b/src/Magnum/Shapes/Test/CollisionTest.cpp
index 545d13f35..8501bb80d 100644
--- a/src/Magnum/Shapes/Test/CollisionTest.cpp
+++ b/src/Magnum/Shapes/Test/CollisionTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Shapes/Collision.h"
 #include "Magnum.h"
diff --git a/src/Magnum/Shapes/Test/CompositionTest.cpp b/src/Magnum/Shapes/Test/CompositionTest.cpp
index da9a4d08e..cb6f3f76c 100644
--- a/src/Magnum/Shapes/Test/CompositionTest.cpp
+++ b/src/Magnum/Shapes/Test/CompositionTest.cpp
@@ -22,8 +22,6 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
-
 #include "Math/Matrix3.h"
 #include "Math/Matrix4.h"
 #include "Shapes/Point.h"
diff --git a/src/Magnum/Shapes/Test/LineTest.cpp b/src/Magnum/Shapes/Test/LineTest.cpp
index bb8ce701d..73e2681bc 100644
--- a/src/Magnum/Shapes/Test/LineTest.cpp
+++ b/src/Magnum/Shapes/Test/LineTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Matrix4.h"
 #include "Magnum.h"
diff --git a/src/Magnum/Shapes/Test/PointTest.cpp b/src/Magnum/Shapes/Test/PointTest.cpp
index 38d344edc..3a6f02be7 100644
--- a/src/Magnum/Shapes/Test/PointTest.cpp
+++ b/src/Magnum/Shapes/Test/PointTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Matrix4.h"
 #include "Magnum.h"
diff --git a/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp b/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp
index eced1884a..27c58566f 100644
--- a/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp
+++ b/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Shapes/shapeImplementation.h"
 
diff --git a/src/Magnum/Shapes/Test/ShapeTest.cpp b/src/Magnum/Shapes/Test/ShapeTest.cpp
index 432c55a9d..2f86d4949 100644
--- a/src/Magnum/Shapes/Test/ShapeTest.cpp
+++ b/src/Magnum/Shapes/Test/ShapeTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Shapes/ShapeGroup.h"
 #include "Shapes/Shape.h"
diff --git a/src/Magnum/Shapes/Test/ShapeTestBase.h b/src/Magnum/Shapes/Test/ShapeTestBase.h
index 348cc3ee7..bb5cff964 100644
--- a/src/Magnum/Shapes/Test/ShapeTestBase.h
+++ b/src/Magnum/Shapes/Test/ShapeTestBase.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 namespace Magnum { namespace Shapes { namespace Test {
 
diff --git a/src/Magnum/Shapes/magnumShapesVisibility.h b/src/Magnum/Shapes/magnumShapesVisibility.h
index 2af59f9b8..008ae8a88 100644
--- a/src/Magnum/Shapes/magnumShapesVisibility.h
+++ b/src/Magnum/Shapes/magnumShapesVisibility.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "magnumConfigure.h"
 
diff --git a/src/Magnum/Shapes/shapeImplementation.cpp b/src/Magnum/Shapes/shapeImplementation.cpp
index 3a783de32..b89560d60 100644
--- a/src/Magnum/Shapes/shapeImplementation.cpp
+++ b/src/Magnum/Shapes/shapeImplementation.cpp
@@ -24,7 +24,7 @@
 
 #include "shapeImplementation.h"
 
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 namespace Magnum { namespace Shapes { namespace Implementation {
 
diff --git a/src/Magnum/Shapes/shapeImplementation.h b/src/Magnum/Shapes/shapeImplementation.h
index 8febd6a8a..fc6301a53 100644
--- a/src/Magnum/Shapes/shapeImplementation.h
+++ b/src/Magnum/Shapes/shapeImplementation.h
@@ -25,8 +25,8 @@
 */
 
 #include <utility>
-#include <Utility/Assert.h>
-#include <corradeCompatibility.h>
+#include <Corrade/compatibility.h>
+#include <Corrade/Utility/Assert.h>
 
 #include "DimensionTraits.h"
 #include "Magnum.h"
diff --git a/src/Magnum/Test/AbstractImageTest.cpp b/src/Magnum/Test/AbstractImageTest.cpp
index 864a9e601..9e386f235 100644
--- a/src/Magnum/Test/AbstractImageTest.cpp
+++ b/src/Magnum/Test/AbstractImageTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "AbstractImage.h"
 #include "Image.h"
diff --git a/src/Magnum/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h
index ef1c7c0be..f2743b7ae 100644
--- a/src/Magnum/Test/AbstractOpenGLTester.h
+++ b/src/Magnum/Test/AbstractOpenGLTester.h
@@ -24,8 +24,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
-#include <corradeCompatibility.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/compatibility.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp
index 0fd679c97..858c7cd2e 100644
--- a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp
+++ b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Resource.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "Math/Matrix.h"
 #include "Math/Vector4.h"
diff --git a/src/Magnum/Test/AbstractShaderProgramTest.cpp b/src/Magnum/Test/AbstractShaderProgramTest.cpp
index 4df6e4eb9..c09832c9d 100644
--- a/src/Magnum/Test/AbstractShaderProgramTest.cpp
+++ b/src/Magnum/Test/AbstractShaderProgramTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "AbstractShaderProgram.h"
 
diff --git a/src/Magnum/Test/ArrayTest.cpp b/src/Magnum/Test/ArrayTest.cpp
index 1a677aa33..84bca1274 100644
--- a/src/Magnum/Test/ArrayTest.cpp
+++ b/src/Magnum/Test/ArrayTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Array.h"
 
diff --git a/src/Magnum/Test/BufferGLTest.cpp b/src/Magnum/Test/BufferGLTest.cpp
index 92b8a0c34..e565797d2 100644
--- a/src/Magnum/Test/BufferGLTest.cpp
+++ b/src/Magnum/Test/BufferGLTest.cpp
@@ -24,7 +24,7 @@
 
 #include <array>
 #include <vector>
-#include <Containers/Array.h>
+#include <Corrade/Containers/Array.h>
 
 #include "Buffer.h"
 #include "Context.h"
diff --git a/src/Magnum/Test/BufferImageGLTest.cpp b/src/Magnum/Test/BufferImageGLTest.cpp
index 815aeb1c4..72d257f50 100644
--- a/src/Magnum/Test/BufferImageGLTest.cpp
+++ b/src/Magnum/Test/BufferImageGLTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Compare/Container.h>
+#include <Corrade/TestSuite/Compare/Container.h>
 
 #include "BufferImage.h"
 #include "ColorFormat.h"
diff --git a/src/Magnum/Test/BufferTextureGLTest.cpp b/src/Magnum/Test/BufferTextureGLTest.cpp
index e7029f69f..1ea39e425 100644
--- a/src/Magnum/Test/BufferTextureGLTest.cpp
+++ b/src/Magnum/Test/BufferTextureGLTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Compare/Container.h>
+#include <Corrade/TestSuite/Compare/Container.h>
 
 #include "Buffer.h"
 #include "BufferTexture.h"
diff --git a/src/Magnum/Test/ColorTest.cpp b/src/Magnum/Test/ColorTest.cpp
index dfb1ac2c5..0762c00cd 100644
--- a/src/Magnum/Test/ColorTest.cpp
+++ b/src/Magnum/Test/ColorTest.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Color.h"
 
diff --git a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
index 455f24cfe..c71aae2e9 100644
--- a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
+++ b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Compare/Container.h>
+#include <Corrade/TestSuite/Compare/Container.h>
 
 #include "BufferImage.h"
 #include "ColorFormat.h"
diff --git a/src/Magnum/Test/CubeMapTextureGLTest.cpp b/src/Magnum/Test/CubeMapTextureGLTest.cpp
index d72978e72..2276be95b 100644
--- a/src/Magnum/Test/CubeMapTextureGLTest.cpp
+++ b/src/Magnum/Test/CubeMapTextureGLTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Compare/Container.h>
+#include <Corrade/TestSuite/Compare/Container.h>
 
 #include "BufferImage.h"
 #include "ColorFormat.h"
diff --git a/src/Magnum/Test/DebugMessageTest.cpp b/src/Magnum/Test/DebugMessageTest.cpp
index 868c6178d..5fb963e18 100644
--- a/src/Magnum/Test/DebugMessageTest.cpp
+++ b/src/Magnum/Test/DebugMessageTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "DebugMessage.h"
 
diff --git a/src/Magnum/Test/DefaultFramebufferTest.cpp b/src/Magnum/Test/DefaultFramebufferTest.cpp
index a0dceffbd..1a09256bc 100644
--- a/src/Magnum/Test/DefaultFramebufferTest.cpp
+++ b/src/Magnum/Test/DefaultFramebufferTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "DefaultFramebuffer.h"
 
diff --git a/src/Magnum/Test/FramebufferTest.cpp b/src/Magnum/Test/FramebufferTest.cpp
index a3b43be21..2879c4722 100644
--- a/src/Magnum/Test/FramebufferTest.cpp
+++ b/src/Magnum/Test/FramebufferTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Framebuffer.h"
 
diff --git a/src/Magnum/Test/ImageReferenceTest.cpp b/src/Magnum/Test/ImageReferenceTest.cpp
index eeb80a59f..4be244c97 100644
--- a/src/Magnum/Test/ImageReferenceTest.cpp
+++ b/src/Magnum/Test/ImageReferenceTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "ColorFormat.h"
 #include "ImageReference.h"
diff --git a/src/Magnum/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp
index 2a464cf55..db8d69a46 100644
--- a/src/Magnum/Test/ImageTest.cpp
+++ b/src/Magnum/Test/ImageTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "ColorFormat.h"
 #include "Image.h"
diff --git a/src/Magnum/Test/MeshTest.cpp b/src/Magnum/Test/MeshTest.cpp
index b3b4fe283..bc942adab 100644
--- a/src/Magnum/Test/MeshTest.cpp
+++ b/src/Magnum/Test/MeshTest.cpp
@@ -23,8 +23,8 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
-#include <Utility/Configuration.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Configuration.h>
 
 #include "Mesh.h"
 
diff --git a/src/Magnum/Test/PrimitiveQueryGLTest.cpp b/src/Magnum/Test/PrimitiveQueryGLTest.cpp
index 7e6691454..fe09a43ed 100644
--- a/src/Magnum/Test/PrimitiveQueryGLTest.cpp
+++ b/src/Magnum/Test/PrimitiveQueryGLTest.cpp
@@ -22,8 +22,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Assert.h>
-#include <Utility/Resource.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "AbstractShaderProgram.h"
 #include "Buffer.h"
diff --git a/src/Magnum/Test/RendererTest.cpp b/src/Magnum/Test/RendererTest.cpp
index 7e784dc11..07d6493f1 100644
--- a/src/Magnum/Test/RendererTest.cpp
+++ b/src/Magnum/Test/RendererTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Renderer.h"
 
diff --git a/src/Magnum/Test/ResourceManagerTest.cpp b/src/Magnum/Test/ResourceManagerTest.cpp
index 7718c1906..e6cb366e1 100644
--- a/src/Magnum/Test/ResourceManagerTest.cpp
+++ b/src/Magnum/Test/ResourceManagerTest.cpp
@@ -23,13 +23,12 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/compatibility.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "AbstractResourceLoader.h"
 #include "ResourceManager.h"
 
-#include "corradeCompatibility.h"
-
 namespace Magnum { namespace Test {
 
 class ResourceManagerTest: public TestSuite::Tester {
diff --git a/src/Magnum/Test/SampleQueryGLTest.cpp b/src/Magnum/Test/SampleQueryGLTest.cpp
index 3fae6a0f7..bc6a1d91b 100644
--- a/src/Magnum/Test/SampleQueryGLTest.cpp
+++ b/src/Magnum/Test/SampleQueryGLTest.cpp
@@ -22,8 +22,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Assert.h>
-#include <Utility/Resource.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "AbstractShaderProgram.h"
 #include "Buffer.h"
diff --git a/src/Magnum/Test/SamplerTest.cpp b/src/Magnum/Test/SamplerTest.cpp
index 961b16f1c..a4fcfeb73 100644
--- a/src/Magnum/Test/SamplerTest.cpp
+++ b/src/Magnum/Test/SamplerTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Sampler.h"
 
diff --git a/src/Magnum/Test/ShaderGLTest.cpp b/src/Magnum/Test/ShaderGLTest.cpp
index 37bba4647..e8de60201 100644
--- a/src/Magnum/Test/ShaderGLTest.cpp
+++ b/src/Magnum/Test/ShaderGLTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Directory.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "Context.h"
 #include "Extensions.h"
diff --git a/src/Magnum/Test/ShaderTest.cpp b/src/Magnum/Test/ShaderTest.cpp
index 451be692a..3301e17cc 100644
--- a/src/Magnum/Test/ShaderTest.cpp
+++ b/src/Magnum/Test/ShaderTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Shader.h"
 
diff --git a/src/Magnum/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp
index f3582b65a..3650af957 100644
--- a/src/Magnum/Test/TextureGLTest.cpp
+++ b/src/Magnum/Test/TextureGLTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Compare/Container.h>
+#include <Corrade/TestSuite/Compare/Container.h>
 
 #include "BufferImage.h"
 #include "ColorFormat.h"
diff --git a/src/Magnum/Test/VersionTest.cpp b/src/Magnum/Test/VersionTest.cpp
index d3d6d9693..406398841 100644
--- a/src/Magnum/Test/VersionTest.cpp
+++ b/src/Magnum/Test/VersionTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Version.h"
 
diff --git a/src/Magnum/Text/AbstractFont.cpp b/src/Magnum/Text/AbstractFont.cpp
index ccb1c3ef5..176ec02e0 100644
--- a/src/Magnum/Text/AbstractFont.cpp
+++ b/src/Magnum/Text/AbstractFont.cpp
@@ -24,9 +24,9 @@
 
 #include "AbstractFont.h"
 
-#include <Containers/Array.h>
-#include <Utility/Directory.h>
-#include <Utility/Unicode.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/Directory.h>
+#include <Corrade/Utility/Unicode.h>
 
 #include "Text/GlyphCache.h"
 
diff --git a/src/Magnum/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h
index 6c6851e04..1dbfa864e 100644
--- a/src/Magnum/Text/AbstractFont.h
+++ b/src/Magnum/Text/AbstractFont.h
@@ -31,7 +31,7 @@
 #include <memory>
 #include <string>
 #include <tuple>
-#include <PluginManager/AbstractPlugin.h>
+#include <Corrade/PluginManager/AbstractPlugin.h>
 
 #include "Magnum.h"
 #include "Texture.h"
diff --git a/src/Magnum/Text/AbstractFontConverter.cpp b/src/Magnum/Text/AbstractFontConverter.cpp
index 0c1711598..3f543d507 100644
--- a/src/Magnum/Text/AbstractFontConverter.cpp
+++ b/src/Magnum/Text/AbstractFontConverter.cpp
@@ -25,10 +25,10 @@
 #include "AbstractFontConverter.h"
 
 #include <algorithm>
-#include <Containers/Array.h>
-#include <Utility/Assert.h>
-#include <Utility/Directory.h>
-#include <Utility/Unicode.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Directory.h>
+#include <Corrade/Utility/Unicode.h>
 
 #include "Text/GlyphCache.h"
 
diff --git a/src/Magnum/Text/AbstractFontConverter.h b/src/Magnum/Text/AbstractFontConverter.h
index b000f8572..b9cf01e4b 100644
--- a/src/Magnum/Text/AbstractFontConverter.h
+++ b/src/Magnum/Text/AbstractFontConverter.h
@@ -29,7 +29,7 @@
  */
 
 #include <memory>
-#include <PluginManager/AbstractPlugin.h>
+#include <Corrade/PluginManager/AbstractPlugin.h>
 
 #include "Magnum.h"
 #include "Text/Text.h"
diff --git a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp
index fc38f8b8b..c22cd8e2d 100644
--- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp
+++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp
@@ -22,10 +22,10 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Containers/Array.h>
-#include <TestSuite/Tester.h>
-#include <TestSuite/Compare/FileToString.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/TestSuite/Compare/FileToString.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "Text/AbstractFontConverter.h"
 #include "Text/GlyphCache.h"
diff --git a/src/Magnum/Text/Test/AbstractFontTest.cpp b/src/Magnum/Text/Test/AbstractFontTest.cpp
index afb577ecd..3c5e3eb8d 100644
--- a/src/Magnum/Text/Test/AbstractFontTest.cpp
+++ b/src/Magnum/Text/Test/AbstractFontTest.cpp
@@ -22,9 +22,9 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Containers/Array.h>
-#include <TestSuite/Tester.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "Text/AbstractFont.h"
 
diff --git a/src/Magnum/Text/Test/AbstractLayouterTest.cpp b/src/Magnum/Text/Test/AbstractLayouterTest.cpp
index 18d5feb8e..53e9a109c 100644
--- a/src/Magnum/Text/Test/AbstractLayouterTest.cpp
+++ b/src/Magnum/Text/Test/AbstractLayouterTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Range.h"
 #include "Text/AbstractFont.h"
diff --git a/src/Magnum/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp
index 5189b056d..8ea4d40e0 100644
--- a/src/Magnum/Text/fontconverter.cpp
+++ b/src/Magnum/Text/fontconverter.cpp
@@ -22,9 +22,9 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <PluginManager/Manager.h>
-#include <Utility/Arguments.h>
-#include <Utility/Directory.h>
+#include <Corrade/PluginManager/Manager.h>
+#include <Corrade/Utility/Arguments.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "Platform/WindowlessGlxApplication.h"
 #include "Text/AbstractFont.h"
diff --git a/src/Magnum/Text/magnumTextVisibility.h b/src/Magnum/Text/magnumTextVisibility.h
index c15adef5a..ab2fe21ae 100644
--- a/src/Magnum/Text/magnumTextVisibility.h
+++ b/src/Magnum/Text/magnumTextVisibility.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "magnumConfigure.h"
 
diff --git a/src/Magnum/TextureTools/DistanceField.cpp b/src/Magnum/TextureTools/DistanceField.cpp
index 107d7d033..0d1a1561d 100644
--- a/src/Magnum/TextureTools/DistanceField.cpp
+++ b/src/Magnum/TextureTools/DistanceField.cpp
@@ -24,7 +24,7 @@
 
 #include "TextureTools/DistanceField.h"
 
-#include <Utility/Resource.h>
+#include <Corrade/Utility/Resource.h>
 
 #include "Math/Range.h"
 #include "AbstractShaderProgram.h"
diff --git a/src/Magnum/TextureTools/Test/AtlasTest.cpp b/src/Magnum/TextureTools/Test/AtlasTest.cpp
index 11d8a4c32..2ef4fea7a 100644
--- a/src/Magnum/TextureTools/Test/AtlasTest.cpp
+++ b/src/Magnum/TextureTools/Test/AtlasTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Math/Range.h"
 #include "TextureTools/Atlas.h"
diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp
index 8fd096224..0174eaddb 100644
--- a/src/Magnum/TextureTools/distancefieldconverter.cpp
+++ b/src/Magnum/TextureTools/distancefieldconverter.cpp
@@ -22,8 +22,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Arguments.h>
-#include <PluginManager/Manager.h>
+#include <Corrade/Utility/Arguments.h>
+#include <Corrade/PluginManager/Manager.h>
 
 #include "Math/Range.h"
 #include "ColorFormat.h"
diff --git a/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp b/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp
index 9ac0777df..d6d00ea1f 100644
--- a/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp
+++ b/src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp
@@ -27,8 +27,8 @@
 #include "magnumConfigure.h"
 
 #ifdef MAGNUM_BUILD_STATIC
-#include <Utility/Resource.h>
-#include <Utility/Macros.h>
+#include <Corrade/Utility/Resource.h>
+#include <Corrade/Utility/Macros.h>
 
 static int magnumTextureToolsResourceImport() {
     CORRADE_RESOURCE_INITIALIZE(MagnumTextureTools_RCS)
diff --git a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h
index c552e907d..93de7e8cf 100644
--- a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h
+++ b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "magnumConfigure.h"
 
diff --git a/src/Magnum/Timeline.cpp b/src/Magnum/Timeline.cpp
index 6d6c2b65e..020ecf7c0 100644
--- a/src/Magnum/Timeline.cpp
+++ b/src/Magnum/Timeline.cpp
@@ -24,8 +24,8 @@
 
 #include "Timeline.h"
 
-#include <Utility/Debug.h>
-#include <Utility/utilities.h>
+#include <Corrade/Utility/Debug.h>
+#include <Corrade/Utility/utilities.h>
 
 #include "Magnum.h"
 
diff --git a/src/Magnum/Trade/AbstractImageConverter.cpp b/src/Magnum/Trade/AbstractImageConverter.cpp
index 4e22d6f60..b0040f81a 100644
--- a/src/Magnum/Trade/AbstractImageConverter.cpp
+++ b/src/Magnum/Trade/AbstractImageConverter.cpp
@@ -24,9 +24,9 @@
 
 #include "AbstractImageConverter.h"
 
-#include <Containers/Array.h>
-#include <Utility/Assert.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Directory.h>
 
 namespace Magnum { namespace Trade {
 
diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h
index d3f46e1d9..e9712c654 100644
--- a/src/Magnum/Trade/AbstractImageConverter.h
+++ b/src/Magnum/Trade/AbstractImageConverter.h
@@ -28,7 +28,7 @@
  * @brief Class Magnum::Trade::AbstractImageConverter
  */
 
-#include <PluginManager/AbstractPlugin.h>
+#include <Corrade/PluginManager/AbstractPlugin.h>
 
 #include "Magnum.h"
 #include "Text/Text.h"
diff --git a/src/Magnum/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp
index d6bc760c3..fc443f4c0 100644
--- a/src/Magnum/Trade/AbstractImporter.cpp
+++ b/src/Magnum/Trade/AbstractImporter.cpp
@@ -24,9 +24,9 @@
 
 #include "AbstractImporter.h"
 
-#include <Containers/Array.h>
-#include <Utility/Assert.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "Trade/AbstractMaterialData.h"
 #include "Trade/CameraData.h"
diff --git a/src/Magnum/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h
index ef427065c..edab4f813 100644
--- a/src/Magnum/Trade/AbstractImporter.h
+++ b/src/Magnum/Trade/AbstractImporter.h
@@ -29,8 +29,8 @@
  */
 
 #include <memory>
-#include <Containers/EnumSet.h>
-#include <PluginManager/AbstractPlugin.h>
+#include <Corrade/Containers/EnumSet.h>
+#include <Corrade/PluginManager/AbstractPlugin.h>
 
 #include "Optional/optional.hpp"
 
diff --git a/src/Magnum/Trade/AbstractMaterialData.cpp b/src/Magnum/Trade/AbstractMaterialData.cpp
index 4ee1fb912..1ddf31593 100644
--- a/src/Magnum/Trade/AbstractMaterialData.cpp
+++ b/src/Magnum/Trade/AbstractMaterialData.cpp
@@ -24,7 +24,7 @@
 
 #include "AbstractMaterialData.h"
 
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 namespace Magnum { namespace Trade {
 
diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp
index 78cb19876..72a352445 100644
--- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp
+++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp
@@ -22,10 +22,10 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Containers/Array.h>
-#include <TestSuite/Tester.h>
-#include <TestSuite/Compare/FileToString.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/TestSuite/Compare/FileToString.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "ColorFormat.h"
 #include "ImageReference.h"
diff --git a/src/Magnum/Trade/Test/AbstractImporterTest.cpp b/src/Magnum/Trade/Test/AbstractImporterTest.cpp
index 3dacf06dd..62372489d 100644
--- a/src/Magnum/Trade/Test/AbstractImporterTest.cpp
+++ b/src/Magnum/Trade/Test/AbstractImporterTest.cpp
@@ -22,9 +22,9 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Containers/Array.h>
-#include <TestSuite/Tester.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "Trade/AbstractImporter.h"
 
diff --git a/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp b/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp
index a85f6308f..1ebc7c94d 100644
--- a/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp
+++ b/src/Magnum/Trade/Test/AbstractMaterialDataTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Trade/AbstractMaterialData.h"
 
diff --git a/src/Magnum/Trade/Test/ImageDataTest.cpp b/src/Magnum/Trade/Test/ImageDataTest.cpp
index a2310158b..95728d240 100644
--- a/src/Magnum/Trade/Test/ImageDataTest.cpp
+++ b/src/Magnum/Trade/Test/ImageDataTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "ColorFormat.h"
 #include "Trade/ImageData.h"
diff --git a/src/Magnum/Trade/Test/ObjectData2DTest.cpp b/src/Magnum/Trade/Test/ObjectData2DTest.cpp
index 4806c02fa..38ab97478 100644
--- a/src/Magnum/Trade/Test/ObjectData2DTest.cpp
+++ b/src/Magnum/Trade/Test/ObjectData2DTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Trade/ObjectData2D.h"
 
diff --git a/src/Magnum/Trade/Test/ObjectData3DTest.cpp b/src/Magnum/Trade/Test/ObjectData3DTest.cpp
index ec08578ae..0170384a2 100644
--- a/src/Magnum/Trade/Test/ObjectData3DTest.cpp
+++ b/src/Magnum/Trade/Test/ObjectData3DTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Trade/ObjectData3D.h"
 
diff --git a/src/Magnum/Trade/Test/TextureDataTest.cpp b/src/Magnum/Trade/Test/TextureDataTest.cpp
index 3fb83bd70..408f887e3 100644
--- a/src/Magnum/Trade/Test/TextureDataTest.cpp
+++ b/src/Magnum/Trade/Test/TextureDataTest.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <sstream>
-#include <TestSuite/Tester.h>
+#include <Corrade/TestSuite/Tester.h>
 
 #include "Trade/TextureData.h"
 
diff --git a/src/Magnum/Version.cpp b/src/Magnum/Version.cpp
index 57cdd543b..1be0559df 100644
--- a/src/Magnum/Version.cpp
+++ b/src/Magnum/Version.cpp
@@ -24,7 +24,7 @@
 
 #include "Version.h"
 
-#include <Utility/Debug.h>
+#include <Corrade/Utility/Debug.h>
 
 namespace Magnum {
 
diff --git a/src/Magnum/magnumVisibility.h b/src/Magnum/magnumVisibility.h
index 3916257c3..2d5b0f886 100644
--- a/src/Magnum/magnumVisibility.h
+++ b/src/Magnum/magnumVisibility.h
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "magnumConfigure.h"
 
diff --git a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp
index 89a18202c..9bab28e1f 100644
--- a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp
+++ b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp
@@ -25,9 +25,9 @@
 #include "MagnumFont.h"
 
 #include <sstream>
-#include <Containers/Array.h>
-#include <Utility/Directory.h>
-#include <Utility/Unicode.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/Directory.h>
+#include <Corrade/Utility/Unicode.h>
 
 #include "Text/GlyphCache.h"
 #include "Trade/ImageData.h"
diff --git a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp
index f0d3b69e3..1d453c2c7 100644
--- a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp
+++ b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp
@@ -22,7 +22,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Directory.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "Test/AbstractOpenGLTester.h"
 #include "Text/GlyphCache.h"
diff --git a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp
index 64ca48c35..721bf7860 100644
--- a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp
+++ b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp
@@ -25,8 +25,8 @@
 #include "MagnumFontConverter.h"
 
 #include <sstream>
-#include <Containers/Array.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "ColorFormat.h"
 #include "Image.h"
diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp
index a104604ad..05d54cea3 100644
--- a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp
+++ b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp
@@ -22,8 +22,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <Utility/Directory.h>
-#include <TestSuite/Compare/File.h>
+#include <Corrade/Utility/Directory.h>
+#include <Corrade/TestSuite/Compare/File.h>
 
 #include "ColorFormat.h"
 #include "Extensions.h"
diff --git a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
index cc9365fa2..b86cc4184 100644
--- a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
+++ b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
@@ -24,9 +24,9 @@
 
 #include <sstream>
 #include <tuple>
-#include <Containers/Array.h>
-#include <TestSuite/Tester.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "ColorFormat.h"
 #include "Image.h"
diff --git a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp
index 7f2b2d663..c212ae7f2 100644
--- a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp
+++ b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp
@@ -27,8 +27,8 @@
 #include <fstream>
 #include <tuple>
 
-#include <Containers/Array.h>
-#include <Utility/Endianness.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Utility/Endianness.h>
 
 #include "ColorFormat.h"
 #include "Image.h"
diff --git a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp
index 241d71f04..3ce181d5a 100644
--- a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp
+++ b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp
@@ -23,9 +23,9 @@
 */
 
 #include <sstream>
-#include <Containers/Array.h>
-#include <TestSuite/Tester.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "ColorFormat.h"
 #include "Trade/ImageData.h"
diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp
index 1e8d7d769..aa8e2267c 100644
--- a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp
+++ b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp
@@ -26,8 +26,8 @@
 
 #include <fstream>
 #include <sstream>
-#include <Utility/Endianness.h>
-#include <Containers/Array.h>
+#include <Corrade/Utility/Endianness.h>
+#include <Corrade/Containers/Array.h>
 
 #include "ColorFormat.h"
 #include "Trade/ImageData.h"
diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.h b/src/MagnumPlugins/TgaImporter/TgaImporter.h
index ff0bc78a1..c3eace385 100644
--- a/src/MagnumPlugins/TgaImporter/TgaImporter.h
+++ b/src/MagnumPlugins/TgaImporter/TgaImporter.h
@@ -28,7 +28,7 @@
  * @brief Class Magnum::Trade::TgaImporter
  */
 
-#include <Utility/Visibility.h>
+#include <Corrade/Utility/VisibilityMacros.h>
 
 #include "Trade/AbstractImporter.h"
 
diff --git a/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
index 1a9593379..a5dfba801 100644
--- a/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
+++ b/src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp
@@ -23,9 +23,9 @@
 */
 
 #include <sstream>
-#include <Containers/Array.h>
-#include <TestSuite/Tester.h>
-#include <Utility/Directory.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/Utility/Directory.h>
 
 #include "WavAudioImporter/WavImporter.h"
 
diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
index 882112c36..5c1bd54ce 100644
--- a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
+++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp
@@ -24,9 +24,9 @@
 
 #include "WavImporter.h"
 
-#include <Utility/Assert.h>
-#include <Utility/Debug.h>
-#include <Utility/Endianness.h>
+#include <Corrade/Utility/Assert.h>
+#include <Corrade/Utility/Debug.h>
+#include <Corrade/Utility/Endianness.h>
 
 #include "WavHeader.h"
 
diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.h b/src/MagnumPlugins/WavAudioImporter/WavImporter.h
index 58c8d2c84..73595b00e 100644
--- a/src/MagnumPlugins/WavAudioImporter/WavImporter.h
+++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.h
@@ -28,8 +28,7 @@
  * @brief Class Magnum::Audio::WavImporter
  */
 
-#include <Containers/Array.h>
-#include <Utility/Visibility.h>
+#include <Corrade/Containers/Array.h>
 
 #include "Audio/AbstractImporter.h"