Making includes absolute, part 4: using absolute includes for Corrade.

Also adapted to some Corrade renames.
13 years ago · 8c2291aa49
224 changed files with 327 additions and 343 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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 {

--- 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"
--- 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 {

--- 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"
--- 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"

--- 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 {

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"
--- 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 {

--- 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"
--- 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"
--- 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"
--- 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;
--- 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> {
--- 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> {
--- 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;
--- 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;
--- 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> {
--- 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> {
--- 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;
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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"
--- 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 {

--- 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
--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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"
--- 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"

--- 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 {

--- 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"
--- 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"

--- 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"

--- 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"
--- 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"

--- 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"

--- 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"
--- 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"
--- 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"
--- 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"

--- 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"

--- 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"
--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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() */

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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 {

--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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 {
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"

--- 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 */
--- 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"
--- 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 {
--- 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"
--- 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
--- 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"
--- 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 {

 /**
--- 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"
--- 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;
--- 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"

--- 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 {
--- a/Show More
+++ b/Show More