Making includes absolute, part 5: absolute includes everywhere.

The only places where they aren't absolute are:

 - when header is included from corresponding source file
 - when including headers which are not part of final installation (e.g.
   test-specific configuration, headers from Implementation/)

src/CMakeLists.txt

@@ -45,14 +45,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CO
 # where only our headers will be used
 include_directories(${CMAKE_SOURCE_DIR}/src/MagnumExternal/OpenGL)
 
-if(MAGNUM_BUILD_DEPRECATED)
-    include_directories(
-        ${CMAKE_CURRENT_SOURCE_DIR}/Magnum
-        ${CMAKE_CURRENT_BINARY_DIR}/Magnum
-        ${CMAKE_CURRENT_SOURCE_DIR}/MagnumPlugins
-        ${CMAKE_CURRENT_SOURCE_DIR}/MagnumExternal)
-endif()
-
 add_subdirectory(MagnumExternal)
 add_subdirectory(Magnum)
 add_subdirectory(MagnumPlugins)

src/Magnum/AbstractFramebuffer.cpp

@@ -24,10 +24,10 @@
 
 #include "AbstractFramebuffer.h"
 
-#include "BufferImage.h"
-#include "Context.h"
-#include "Extensions.h"
-#include "Image.h"
+#include "Magnum/BufferImage.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
+#include "Magnum/Image.h"
 
 #include "Implementation/FramebufferState.h"
 #include "Implementation/State.h"

src/Magnum/AbstractFramebuffer.h

@@ -30,9 +30,9 @@
 
 #include <Corrade/Containers/EnumSet.h>
 
-#include "Math/Range.h"
-#include "Magnum.h"
-#include "OpenGL.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/OpenGL.h"
+#include "Magnum/Math/Range.h"
 
 namespace Magnum {
 

src/Magnum/AbstractImage.cpp

@@ -26,8 +26,8 @@
 
 #include <Corrade/Utility/Assert.h>
 
-#include "Math/Vector.h"
-#include "ColorFormat.h"
+#include "Magnum/ColorFormat.h"
+#include "Magnum/Math/Vector.h"
 
 namespace Magnum {
 

src/Magnum/AbstractImage.h

@@ -30,8 +30,8 @@
 
 #include <cstddef>
 
-#include "Magnum.h"
-#include "magnumVisibility.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/magnumVisibility.h"
 
 namespace Magnum {
 

src/Magnum/AbstractObject.cpp

@@ -26,8 +26,9 @@
 
 #include <Corrade/Utility/Assert.h>
 
-#include "Context.h"
-#include "Extensions.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
+
 #include "Implementation/State.h"
 #include "Implementation/DebugState.h"
 

src/Magnum/AbstractObject.h

@@ -30,9 +30,9 @@
 
 #include <string>
 
-#include "OpenGL.h"
-#include "Types.h"
-#include "magnumVisibility.h"
+#include "Magnum/OpenGL.h"
+#include "Magnum/Types.h"
+#include "Magnum/magnumVisibility.h"
 
 namespace Magnum {
 

src/Magnum/AbstractResourceLoader.h

@@ -30,7 +30,7 @@
 
 #include <string>
 
-#include "ResourceManager.h"
+#include "Magnum/ResourceManager.h"
 
 namespace Magnum {
 

src/Magnum/AbstractShaderProgram.cpp

@@ -24,10 +24,11 @@
 
 #include "AbstractShaderProgram.h"
 
-#include "Math/RectangularMatrix.h"
-#include "Context.h"
-#include "Extensions.h"
-#include "Shader.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
+#include "Magnum/Shader.h"
+#include "Magnum/Math/RectangularMatrix.h"
+
 #include "Implementation/DebugState.h"
 #include "Implementation/ShaderProgramState.h"
 #include "Implementation/State.h"

src/Magnum/AbstractShaderProgram.h

@@ -31,9 +31,9 @@
 #include <string>
 #include <Corrade/Containers/EnumSet.h>
 
-#include "AbstractObject.h"
-#include "Magnum.h"
-#include "magnumVisibility.h"
+#include "Magnum/AbstractObject.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/magnumVisibility.h"
 
 namespace Magnum {
 

src/Magnum/AbstractTexture.cpp

@@ -24,13 +24,14 @@
 
 #include "AbstractTexture.h"
 
-#include "BufferImage.h"
-#include "ColorFormat.h"
-#include "Context.h"
-#include "Extensions.h"
-#include "Image.h"
-#include "Shader.h"
-#include "TextureFormat.h"
+#include "Magnum/BufferImage.h"
+#include "Magnum/ColorFormat.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
+#include "Magnum/Image.h"
+#include "Magnum/Shader.h"
+#include "Magnum/TextureFormat.h"
+
 #include "Implementation/DebugState.h"
 #include "Implementation/State.h"
 #include "Implementation/TextureState.h"

src/Magnum/AbstractTexture.h

@@ -28,10 +28,10 @@
  * @brief Class @ref Magnum::AbstractTexture
  */
 
-#include "Array.h"
-#include "Color.h"
-#include "Sampler.h"
-#include "AbstractObject.h"
+#include "Magnum/Array.h"
+#include "Magnum/Color.h"
+#include "Magnum/Sampler.h"
+#include "Magnum/AbstractObject.h"
 
 namespace Magnum {
 

src/Magnum/Array.h

@@ -30,8 +30,8 @@
 
 #include <type_traits>
 
-#include "Math/BoolVector.h" /* for Math::Implementation::Sequence */
-#include "Magnum.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/Math/BoolVector.h" /* for Math::Implementation::Sequence */
 
 namespace Magnum {
 

src/Magnum/Audio/AbstractImporter.h

@@ -30,8 +30,8 @@
 
 #include <Corrade/PluginManager/AbstractPlugin.h>
 
-#include "Magnum.h"
-#include "Audio/Buffer.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/Audio/Buffer.h"
 
 namespace Magnum { namespace Audio {
 

src/Magnum/Audio/Audio.cpp

@@ -25,7 +25,7 @@
 #include <type_traits>
 #include <al.h>
 
-#include "Types.h"
+#include "Magnum/Types.h"
 
 namespace Magnum { namespace Audio {
 

src/Magnum/Audio/Buffer.h

@@ -32,8 +32,8 @@
 #include <al.h>
 #include <Corrade/Containers/Array.h>
 
-#include "Magnum.h"
-#include "Audio/magnumAudioVisibility.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/Audio/magnumAudioVisibility.h"
 
 namespace Magnum { namespace Audio {
 

src/Magnum/Audio/Context.cpp

@@ -28,7 +28,7 @@
 #include <Corrade/Utility/Assert.h>
 #include <Corrade/Utility/Debug.h>
 
-#include "Magnum.h"
+#include "Magnum/Magnum.h"
 
 namespace Magnum { namespace Audio {
 

src/Magnum/Audio/Context.h

@@ -31,7 +31,7 @@
 #include <string>
 #include <al.h>
 
-#include "Audio/magnumAudioVisibility.h"
+#include "Magnum/Audio/magnumAudioVisibility.h"
 
 #ifndef DOXYGEN_GENERATING_OUTPUT
 typedef struct ALCdevice_struct ALCdevice;

src/Magnum/Audio/Renderer.h

@@ -30,9 +30,9 @@
 
 #include <al.h>
 
-#include "Math/Vector3.h"
-#include "Magnum.h"
-#include "Audio/magnumAudioVisibility.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/Audio/magnumAudioVisibility.h"
+#include "Magnum/Math/Vector3.h"
 
 namespace Magnum { namespace Audio {
 

src/Magnum/Audio/Source.cpp

@@ -26,7 +26,7 @@
 
 #include <Corrade/Containers/Array.h>
 
-#include "Audio/Buffer.h"
+#include "Magnum/Audio/Buffer.h"
 
 namespace Magnum { namespace Audio {
 

src/Magnum/Audio/Source.h

@@ -32,10 +32,10 @@
 #include <vector>
 #include <al.h>
 
-#include "Math/Vector3.h"
-#include "Magnum.h"
-#include "Audio/Audio.h"
-#include "Audio/magnumAudioVisibility.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/Audio/Audio.h"
+#include "Magnum/Audio/magnumAudioVisibility.h"
+#include "Magnum/Math/Vector3.h"
 
 namespace Magnum { namespace Audio {
 

src/Magnum/Audio/Test/AbstractImporterTest.cpp

@@ -26,7 +26,7 @@
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/Directory.h>
 
-#include "Audio/AbstractImporter.h"
+#include "Magnum/Audio/AbstractImporter.h"
 
 #include "testConfigure.h"
 

src/Magnum/Audio/Test/BufferTest.cpp

@@ -25,7 +25,7 @@
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
 
-#include "Audio/Buffer.h"
+#include "Magnum/Audio/Buffer.h"
 
 namespace Magnum { namespace Audio { namespace Test {
 

src/Magnum/Audio/Test/RendererTest.cpp

@@ -25,7 +25,7 @@
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
 
-#include "Audio/Renderer.h"
+#include "Magnum/Audio/Renderer.h"
 
 namespace Magnum { namespace Audio { namespace Test {
 

src/Magnum/Audio/Test/SourceTest.cpp

@@ -25,7 +25,7 @@
 #include <sstream>
 #include <Corrade/TestSuite/Tester.h>
 
-#include "Audio/Source.h"
+#include "Magnum/Audio/Source.h"
 
 namespace Magnum { namespace Audio { namespace Test {
 

src/Magnum/Audio/magnumAudioVisibility.h

@@ -26,7 +26,7 @@
 
 #include <Corrade/Utility/VisibilityMacros.h>
 
-#include "magnumConfigure.h"
+#include "Magnum/magnumConfigure.h"
 
 #ifndef MAGNUM_BUILD_STATIC
     #ifdef MagnumAudio_EXPORTS

src/Magnum/Buffer.cpp

@@ -26,8 +26,9 @@
 
 #include <Corrade/Utility/Debug.h>
 
-#include "Context.h"
-#include "Extensions.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
+
 #include "Implementation/State.h"
 #include "Implementation/BufferState.h"
 #include "Implementation/DebugState.h"

src/Magnum/Buffer.h

@@ -35,8 +35,8 @@
 #include <Corrade/Containers/EnumSet.h>
 #include <Corrade/Utility/Assert.h>
 
-#include "AbstractObject.h"
-#include "Magnum.h"
+#include "Magnum/AbstractObject.h"
+#include "Magnum/Magnum.h"
 
 namespace Magnum {
 

src/Magnum/BufferImage.h

@@ -30,10 +30,10 @@
  */
 #endif
 
-#include "Math/Vector3.h"
-#include "AbstractImage.h"
-#include "Buffer.h"
-#include "DimensionTraits.h"
+#include "Magnum/AbstractImage.h"
+#include "Magnum/Buffer.h"
+#include "Magnum/DimensionTraits.h"
+#include "Magnum/Math/Vector3.h"
 
 namespace Magnum {
 

src/Magnum/BufferTexture.cpp

@@ -25,9 +25,9 @@
 #include "BufferTexture.h"
 
 #ifndef MAGNUM_TARGET_GLES
-#include "Buffer.h"
-#include "Context.h"
-#include "Extensions.h"
+#include "Magnum/Buffer.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
 
 #include "Implementation/State.h"
 #include "Implementation/TextureState.h"

src/Magnum/BufferTexture.h

@@ -30,7 +30,7 @@
  */
 #endif
 
-#include "AbstractTexture.h"
+#include "Magnum/AbstractTexture.h"
 
 #ifndef MAGNUM_TARGET_GLES
 namespace Magnum {

src/Magnum/Color.h

@@ -30,9 +30,9 @@
 
 #include <tuple>
 
-#include "Math/Functions.h"
-#include "Math/Vector4.h"
-#include "Magnum.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/Math/Functions.h"
+#include "Magnum/Math/Vector4.h"
 
 namespace Magnum {
 

src/Magnum/ColorFormat.h

@@ -28,9 +28,9 @@
  * @brief Enum @ref Magnum::ColorFormat, @ref Magnum::ColorType
  */
 
-#include "Magnum.h"
-#include "OpenGL.h"
-#include "magnumVisibility.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/OpenGL.h"
+#include "Magnum/magnumVisibility.h"
 
 namespace Magnum {
 

src/Magnum/Context.cpp

@@ -29,17 +29,17 @@
 #include <Corrade/Utility/Debug.h>
 #include <Corrade/Utility/String.h>
 
-#include "AbstractFramebuffer.h"
-#include "AbstractShaderProgram.h"
-#include "AbstractTexture.h"
-#include "Buffer.h"
-#include "BufferTexture.h"
-#include "DefaultFramebuffer.h"
-#include "Extensions.h"
-#include "Framebuffer.h"
-#include "Mesh.h"
-#include "Renderbuffer.h"
-#include "Renderer.h"
+#include "Magnum/AbstractFramebuffer.h"
+#include "Magnum/AbstractShaderProgram.h"
+#include "Magnum/AbstractTexture.h"
+#include "Magnum/Buffer.h"
+#include "Magnum/BufferTexture.h"
+#include "Magnum/DefaultFramebuffer.h"
+#include "Magnum/Extensions.h"
+#include "Magnum/Framebuffer.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/Renderbuffer.h"
+#include "Magnum/Renderer.h"
 
 #include "Implementation/State.h"
 

src/Magnum/Context.h

@@ -33,9 +33,9 @@
 #include <vector>
 #include <Corrade/Containers/EnumSet.h>
 
-#include "Magnum.h"
-#include "OpenGL.h"
-#include "magnumVisibility.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/OpenGL.h"
+#include "Magnum/magnumVisibility.h"
 
 namespace Magnum {
 

src/Magnum/CubeMapTexture.h

@@ -28,7 +28,7 @@
  * @brief Class @ref Magnum::CubeMapTexture
  */
 
-#include "AbstractTexture.h"
+#include "Magnum/AbstractTexture.h"
 
 namespace Magnum {
 

src/Magnum/CubeMapTextureArray.h

@@ -30,7 +30,7 @@
  */
 #endif
 
-#include "AbstractTexture.h"
+#include "Magnum/AbstractTexture.h"
 
 #ifndef MAGNUM_TARGET_GLES
 namespace Magnum {

src/Magnum/DebugMarker.h

@@ -29,7 +29,7 @@
  * @deprecated Use @ref DebugMessage.h instead.
  */
 
-#include "DebugMessage.h"
+#include "Magnum/DebugMessage.h"
 
 #ifdef MAGNUM_BUILD_DEPRECATED
 namespace Magnum {

src/Magnum/DebugMessage.cpp

@@ -26,10 +26,10 @@
 
 #include <Corrade/Utility/Assert.h>
 
-#include "Context.h"
-#include "Extensions.h"
-#include "Implementation/State.h"
-#include "Implementation/DebugState.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
+#include "Magnum/Implementation/State.h"
+#include "Magnum/Implementation/DebugState.h"
 
 namespace Magnum {
 

src/Magnum/DebugMessage.h

@@ -30,9 +30,9 @@
 
 #include <string>
 
-#include "Magnum.h"
-#include "OpenGL.h"
-#include "magnumVisibility.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/OpenGL.h"
+#include "Magnum/magnumVisibility.h"
 
 namespace Magnum {
 

src/Magnum/DebugTools/DebugTools.h

@@ -28,7 +28,7 @@
  * @brief Forward declarations for Magnum::DebugTools namespace
  */
 
-#include "Types.h"
+#include "Magnum/Types.h"
 
 namespace Magnum { namespace DebugTools {
 

src/Magnum/DebugTools/ForceRenderer.cpp

@@ -24,13 +24,13 @@
 
 #include "ForceRenderer.h"
 
-#include "Buffer.h"
-#include "Mesh.h"
-#include "DebugTools/ResourceManager.h"
-#include "SceneGraph/AbstractCamera.h"
-#include "Shaders/Flat.h"
+#include "Magnum/Buffer.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/DebugTools/ResourceManager.h"
+#include "Magnum/SceneGraph/AbstractCamera.h"
+#include "Magnum/Shaders/Flat.h"
 
-#include "DebugTools/Implementation/ForceRendererTransformation.h"
+#include "Implementation/ForceRendererTransformation.h"
 
 namespace Magnum { namespace DebugTools {
 

src/Magnum/DebugTools/ForceRenderer.h

@@ -28,12 +28,11 @@
  * @brief Class Magnum::DebugTools::ForceRenderer, Magnum::DebugTools::ForceRendererOptions, typedef Magnum::DebugTools::ForceRenderer2D, Magnum::DebugTools::ForceRenderer3D
  */
 
-#include "Color.h"
-#include "Resource.h"
-#include "SceneGraph/Drawable.h"
-#include "Shaders/Shaders.h"
-
-#include "magnumDebugToolsVisibility.h"
+#include "Magnum/Color.h"
+#include "Magnum/Resource.h"
+#include "Magnum/SceneGraph/Drawable.h"
+#include "Magnum/Shaders/Shaders.h"
+#include "Magnum/DebugTools/magnumDebugToolsVisibility.h"
 
 namespace Magnum { namespace DebugTools {
 

src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.cpp

@@ -24,11 +24,11 @@
 
 #include "AbstractBoxRenderer.h"
 
-#include "Mesh.h"
-#include "Primitives/Cube.h"
-#include "Primitives/Square.h"
-#include "Trade/MeshData2D.h"
-#include "Trade/MeshData3D.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/Primitives/Cube.h"
+#include "Magnum/Primitives/Square.h"
+#include "Magnum/Trade/MeshData2D.h"
+#include "Magnum/Trade/MeshData3D.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/AbstractBoxRenderer.h

@@ -26,8 +26,8 @@
 
 #include "AbstractShapeRenderer.h"
 
-#include "Resource.h"
-#include "Shaders/Shaders.h"
+#include "Magnum/Resource.h"
+#include "Magnum/Shaders/Shaders.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp

@@ -24,14 +24,14 @@
 
 #include "AbstractShapeRenderer.h"
 
-#include "AbstractShaderProgram.h"
-#include "Buffer.h"
-#include "Mesh.h"
-#include "DebugTools/ResourceManager.h"
-#include "MeshTools/CompressIndices.h"
-#include "Shaders/Flat.h"
-#include "Trade/MeshData2D.h"
-#include "Trade/MeshData3D.h"
+#include "Magnum/AbstractShaderProgram.h"
+#include "Magnum/Buffer.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/DebugTools/ResourceManager.h"
+#include "Magnum/MeshTools/CompressIndices.h"
+#include "Magnum/Shaders/Flat.h"
+#include "Magnum/Trade/MeshData2D.h"
+#include "Magnum/Trade/MeshData3D.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.h

@@ -24,12 +24,12 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "DimensionTraits.h"
-#include "Resource.h"
-#include "DebugTools/DebugTools.h"
-#include "SceneGraph/SceneGraph.h"
-#include "Shaders/Shaders.h"
-#include "Trade/Trade.h"
+#include "Magnum/DimensionTraits.h"
+#include "Magnum/Resource.h"
+#include "Magnum/DebugTools/DebugTools.h"
+#include "Magnum/SceneGraph/SceneGraph.h"
+#include "Magnum/Shaders/Shaders.h"
+#include "Magnum/Trade/Trade.h"
 
 namespace Magnum {
 

src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.cpp

@@ -24,10 +24,10 @@
 
 #include "AxisAlignedBoxRenderer.h"
 
-#include "Mesh.h"
-#include "DebugTools/ShapeRenderer.h"
-#include "Shapes/AxisAlignedBox.h"
-#include "Shaders/Flat.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/DebugTools/ShapeRenderer.h"
+#include "Magnum/Shapes/AxisAlignedBox.h"
+#include "Magnum/Shaders/Flat.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/AxisAlignedBoxRenderer.h

@@ -26,8 +26,9 @@
 
 #include <Corrade/compatibility.h>
 
+#include "Magnum/Shapes/Shapes.h"
+
 #include "AbstractBoxRenderer.h"
-#include "Shapes/Shapes.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/BoxRenderer.cpp

@@ -24,10 +24,10 @@
 
 #include "BoxRenderer.h"
 
-#include "Mesh.h"
-#include "DebugTools/ShapeRenderer.h"
-#include "Shapes/Box.h"
-#include "Shaders/Flat.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/DebugTools/ShapeRenderer.h"
+#include "Magnum/Shapes/Box.h"
+#include "Magnum/Shaders/Flat.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/BoxRenderer.h

@@ -26,8 +26,9 @@
 
 #include <Corrade/compatibility.h>
 
+#include "Magnum/Shapes/Shapes.h"
+
 #include "AbstractBoxRenderer.h"
-#include "Shapes/Shapes.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/CapsuleRenderer.cpp

@@ -24,17 +24,17 @@
 
 #include "CapsuleRenderer.h"
 
-#include "Mesh.h"
-#include "MeshView.h"
-#include "DebugTools/ResourceManager.h"
-#include "DebugTools/ShapeRenderer.h"
-#include "Primitives/Capsule.h"
-#include "Shapes/Capsule.h"
-#include "Shaders/Flat.h"
-#include "Trade/MeshData2D.h"
-#include "Trade/MeshData3D.h"
-
-#include "DebugTools/Implementation/CapsuleRendererTransformation.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/MeshView.h"
+#include "Magnum/DebugTools/ResourceManager.h"
+#include "Magnum/DebugTools/ShapeRenderer.h"
+#include "Magnum/Primitives/Capsule.h"
+#include "Magnum/Shapes/Capsule.h"
+#include "Magnum/Shaders/Flat.h"
+#include "Magnum/Trade/MeshData2D.h"
+#include "Magnum/Trade/MeshData3D.h"
+
+#include "CapsuleRendererTransformation.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/CapsuleRenderer.h

@@ -26,8 +26,9 @@
 
 #include <Corrade/compatibility.h>
 
+#include "Magnum/Shapes/Shapes.h"
+
 #include "AbstractShapeRenderer.h"
-#include "Shapes/Shapes.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/CapsuleRendererTransformation.h

@@ -26,11 +26,11 @@
 
 #include <array>
 
-#include "Math/Functions.h"
-#include "Math/Matrix3.h"
-#include "Math/Matrix4.h"
-#include "Magnum.h"
-#include "DimensionTraits.h"
+#include "Magnum/DimensionTraits.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/Math/Functions.h"
+#include "Magnum/Math/Matrix3.h"
+#include "Magnum/Math/Matrix4.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/CylinderRenderer.cpp

@@ -24,16 +24,16 @@
 
 #include "CylinderRenderer.h"
 
-#include "Mesh.h"
-#include "DebugTools/ShapeRenderer.h"
-#include "Shapes/Cylinder.h"
-#include "Primitives/Cylinder.h"
-#include "Primitives/Square.h"
-#include "Shaders/Flat.h"
-#include "Trade/MeshData2D.h"
-#include "Trade/MeshData3D.h"
-
-#include "DebugTools/Implementation/CylinderRendererTransformation.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/DebugTools/ShapeRenderer.h"
+#include "Magnum/Shapes/Cylinder.h"
+#include "Magnum/Primitives/Cylinder.h"
+#include "Magnum/Primitives/Square.h"
+#include "Magnum/Shaders/Flat.h"
+#include "Magnum/Trade/MeshData2D.h"
+#include "Magnum/Trade/MeshData3D.h"
+
+#include "CylinderRendererTransformation.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/CylinderRenderer.h

@@ -26,8 +26,9 @@
 
 #include <Corrade/compatibility.h>
 
+#include "Magnum/Shapes/Shapes.h"
+
 #include "AbstractShapeRenderer.h"
-#include "Shapes/Shapes.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/CylinderRendererTransformation.h

@@ -24,11 +24,11 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "Math/Functions.h"
-#include "Math/Matrix3.h"
-#include "Math/Matrix4.h"
-#include "Magnum.h"
-#include "DimensionTraits.h"
+#include "Magnum/DimensionTraits.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/Math/Functions.h"
+#include "Magnum/Math/Matrix3.h"
+#include "Magnum/Math/Matrix4.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/ForceRendererTransformation.h

@@ -24,11 +24,11 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "Math/Functions.h"
-#include "Math/Matrix3.h"
-#include "Math/Matrix4.h"
-#include "Magnum.h"
-#include "DimensionTraits.h"
+#include "Magnum/DimensionTraits.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/Math/Functions.h"
+#include "Magnum/Math/Matrix3.h"
+#include "Magnum/Math/Matrix4.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/LineSegmentRenderer.cpp

@@ -24,15 +24,15 @@
 
 #include "LineSegmentRenderer.h"
 
-#include "Mesh.h"
-#include "DebugTools/ShapeRenderer.h"
-#include "Shapes/LineSegment.h"
-#include "Primitives/Line.h"
-#include "Shaders/Flat.h"
-#include "Trade/MeshData2D.h"
-#include "Trade/MeshData3D.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/DebugTools/ShapeRenderer.h"
+#include "Magnum/Shapes/LineSegment.h"
+#include "Magnum/Primitives/Line.h"
+#include "Magnum/Shaders/Flat.h"
+#include "Magnum/Trade/MeshData2D.h"
+#include "Magnum/Trade/MeshData3D.h"
 
-#include "DebugTools/Implementation/LineSegmentRendererTransformation.h"
+#include "LineSegmentRendererTransformation.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/LineSegmentRenderer.h

@@ -26,8 +26,9 @@
 
 #include <Corrade/compatibility.h>
 
+#include "Magnum/Shapes/Shapes.h"
+
 #include "AbstractShapeRenderer.h"
-#include "Shapes/Shapes.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/LineSegmentRendererTransformation.h

@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "DimensionTraits.h"
+#include "Magnum/DimensionTraits.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/PointRenderer.cpp

@@ -24,13 +24,13 @@
 
 #include "PointRenderer.h"
 
-#include "Mesh.h"
-#include "DebugTools/ShapeRenderer.h"
-#include "Shapes/Point.h"
-#include "Primitives/Crosshair.h"
-#include "Shaders/Flat.h"
-#include "Trade/MeshData2D.h"
-#include "Trade/MeshData3D.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/DebugTools/ShapeRenderer.h"
+#include "Magnum/Shapes/Point.h"
+#include "Magnum/Primitives/Crosshair.h"
+#include "Magnum/Shaders/Flat.h"
+#include "Magnum/Trade/MeshData2D.h"
+#include "Magnum/Trade/MeshData3D.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/PointRenderer.h

@@ -26,8 +26,9 @@
 
 #include <Corrade/compatibility.h>
 
+#include "Magnum/Shapes/Shapes.h"
+
 #include "AbstractShapeRenderer.h"
-#include "Shapes/Shapes.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/SphereRenderer.cpp

@@ -24,14 +24,14 @@
 
 #include "SphereRenderer.h"
 
-#include "Mesh.h"
-#include "DebugTools/ShapeRenderer.h"
-#include "Shapes/Sphere.h"
-#include "Primitives/Circle.h"
-#include "Primitives/UVSphere.h"
-#include "Shaders/Flat.h"
-#include "Trade/MeshData2D.h"
-#include "Trade/MeshData3D.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/DebugTools/ShapeRenderer.h"
+#include "Magnum/Shapes/Sphere.h"
+#include "Magnum/Primitives/Circle.h"
+#include "Magnum/Primitives/UVSphere.h"
+#include "Magnum/Shaders/Flat.h"
+#include "Magnum/Trade/MeshData2D.h"
+#include "Magnum/Trade/MeshData3D.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/Implementation/SphereRenderer.h

@@ -26,8 +26,9 @@
 
 #include <Corrade/compatibility.h>
 
+#include "Magnum/Shapes/Shapes.h"
+
 #include "AbstractShapeRenderer.h"
-#include "Shapes/Shapes.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation {
 

src/Magnum/DebugTools/ObjectRenderer.cpp

@@ -24,11 +24,11 @@
 
 #include "ObjectRenderer.h"
 
-#include "Buffer.h"
-#include "DebugTools/ResourceManager.h"
-#include "MeshTools/Interleave.h"
-#include "SceneGraph/AbstractCamera.h"
-#include "Shaders/VertexColor.h"
+#include "Magnum/Buffer.h"
+#include "Magnum/DebugTools/ResourceManager.h"
+#include "Magnum/MeshTools/Interleave.h"
+#include "Magnum/SceneGraph/AbstractCamera.h"
+#include "Magnum/Shaders/VertexColor.h"
 
 namespace Magnum { namespace DebugTools {
 

src/Magnum/DebugTools/ObjectRenderer.h

@@ -28,11 +28,10 @@
  * @brief Class Magnum::DebugTools::ObjectRenderer, Magnum::DebugTools::ObjectRendererOptions, typedef Magnum::DebugTools::ObjectRenderer2D, Magnum::DebugTools::ObjectRenderer3D
  */
 
-#include "Resource.h"
-#include "SceneGraph/Drawable.h"
-#include "Shaders/Shaders.h"
-
-#include "magnumDebugToolsVisibility.h"
+#include "Magnum/Resource.h"
+#include "Magnum/SceneGraph/Drawable.h"
+#include "Magnum/Shaders/Shaders.h"
+#include "Magnum/DebugTools/magnumDebugToolsVisibility.h"
 
 namespace Magnum { namespace DebugTools {
 

src/Magnum/DebugTools/Profiler.cpp

@@ -28,7 +28,7 @@
 #include <numeric>
 #include <Corrade/Utility/Assert.h>
 
-#include "Magnum.h"
+#include "Magnum/Magnum.h"
 
 using namespace std::chrono;
 

src/Magnum/DebugTools/Profiler.h

@@ -33,8 +33,8 @@
 #include <string>
 #include <vector>
 
-#include "Types.h"
-#include "magnumDebugToolsVisibility.h"
+#include "Magnum/Types.h"
+#include "Magnum/DebugTools/magnumDebugToolsVisibility.h"
 
 namespace Magnum { namespace DebugTools {
 

src/Magnum/DebugTools/ResourceManager.cpp

@@ -26,12 +26,12 @@
 
 #include "ResourceManager.h"
 
-#include "Buffer.h"
-#include "Mesh.h"
-#include "MeshView.h"
-#include "DebugTools/ForceRenderer.h"
-#include "DebugTools/ObjectRenderer.h"
-#include "DebugTools/ShapeRenderer.h"
+#include "Magnum/Buffer.h"
+#include "Magnum/Mesh.h"
+#include "Magnum/MeshView.h"
+#include "Magnum/DebugTools/ForceRenderer.h"
+#include "Magnum/DebugTools/ObjectRenderer.h"
+#include "Magnum/DebugTools/ShapeRenderer.h"
 
 namespace Magnum {
 

src/Magnum/DebugTools/ResourceManager.h

@@ -28,18 +28,16 @@
  * @brief Class Magnum::DebugTools::ResourceManager
  */
 
-#include "Magnum.h"
-
 #ifndef MAGNUM_RESOURCEMANAGER_DEFINE_INTERNALINSTANCE
 #define MAGNUM_RESOURCEMANAGER_DONT_DEFINE_INTERNALINSTANCE
 #endif
-#include "../ResourceManager.h"
-
-#include "SceneGraph/SceneGraph.h"
-#include "Shapes/Shapes.h"
-#include "DebugTools.h"
+#include "Magnum/ResourceManager.h"
 
-#include "magnumDebugToolsVisibility.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/DebugTools/DebugTools.h"
+#include "Magnum/DebugTools/magnumDebugToolsVisibility.h"
+#include "Magnum/SceneGraph/SceneGraph.h"
+#include "Magnum/Shapes/Shapes.h"
 
 namespace Magnum {
 

src/Magnum/DebugTools/ShapeRenderer.cpp

@@ -24,10 +24,10 @@
 
 #include "ShapeRenderer.h"
 
-#include "ResourceManager.h"
-#include "Shapes/Composition.h"
-#include "Shapes/Shape.h"
-#include "SceneGraph/AbstractCamera.h"
+#include "Magnum/DebugTools/ResourceManager.h"
+#include "Magnum/Shapes/Composition.h"
+#include "Magnum/Shapes/Shape.h"
+#include "Magnum/SceneGraph/AbstractCamera.h"
 
 #include "Implementation/AxisAlignedBoxRenderer.h"
 #include "Implementation/BoxRenderer.h"

src/Magnum/DebugTools/ShapeRenderer.h

@@ -28,13 +28,12 @@
  * @brief Class Magnum::DebugTools::ShapeRenderer, Magnum::DebugTools::ShapeRendererOptions, typedef Magnum::DebugTools::ShapeRenderer2D, Magnum::DebugTools::ShapeRenderer3D
  */
 
-#include "Color.h"
-#include "Resource.h"
-#include "SceneGraph/Drawable.h"
-#include "Shapes/Shapes.h"
-#include "Shapes/shapeImplementation.h"
-
-#include "magnumDebugToolsVisibility.h"
+#include "Magnum/Color.h"
+#include "Magnum/Resource.h"
+#include "Magnum/SceneGraph/Drawable.h"
+#include "Magnum/Shapes/Shapes.h"
+#include "Magnum/Shapes/shapeImplementation.h"
+#include "Magnum/DebugTools/magnumDebugToolsVisibility.h"
 
 namespace Magnum { namespace DebugTools {
 

src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp

@@ -24,7 +24,7 @@
 
 #include <Corrade/TestSuite/Tester.h>
 
-#include "DebugTools/Implementation/CapsuleRendererTransformation.h"
+#include "../Implementation/CapsuleRendererTransformation.h"
 
 namespace Magnum { namespace DebugTools { namespace Test {
 

src/Magnum/DebugTools/Test/CylinderRendererTest.cpp

@@ -24,7 +24,7 @@
 
 #include <Corrade/TestSuite/Tester.h>
 
-#include "DebugTools/Implementation/CylinderRendererTransformation.h"
+#include "../Implementation/CylinderRendererTransformation.h"
 
 namespace Magnum { namespace DebugTools { namespace Test {
 

src/Magnum/DebugTools/Test/ForceRendererTest.cpp

@@ -24,7 +24,7 @@
 
 #include <Corrade/TestSuite/Tester.h>
 
-#include "DebugTools/Implementation/ForceRendererTransformation.h"
+#include "../Implementation/ForceRendererTransformation.h"
 
 namespace Magnum { namespace DebugTools { namespace Implementation { namespace Test {
 

src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp

@@ -24,10 +24,11 @@
 
 #include <Corrade/TestSuite/Tester.h>
 
-#include "Math/Matrix3.h"
-#include "Math/Matrix4.h"
-#include "Magnum.h"
-#include "DebugTools/Implementation/LineSegmentRendererTransformation.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/Math/Matrix3.h"
+#include "Magnum/Math/Matrix4.h"
+
+#include "../Implementation/LineSegmentRendererTransformation.h"
 
 namespace Magnum { namespace DebugTools { namespace Test {
 

src/Magnum/DebugTools/magnumDebugToolsVisibility.h

@@ -26,7 +26,7 @@
 
 #include <Corrade/Utility/VisibilityMacros.h>
 
-#include "magnumConfigure.h"
+#include "Magnum/magnumConfigure.h"
 
 #ifndef MAGNUM_BUILD_STATIC
     #ifdef MagnumDebugTools_EXPORTS

src/Magnum/DefaultFramebuffer.cpp

@@ -26,10 +26,10 @@
 
 #include <Corrade/Containers/Array.h>
 
-#include "Context.h"
-#include "Extensions.h"
-#include "Implementation/State.h"
-#include "Implementation/FramebufferState.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
+#include "Magnum/Implementation/State.h"
+#include "Magnum/Implementation/FramebufferState.h"
 
 namespace Magnum {
 

src/Magnum/DefaultFramebuffer.h

@@ -28,7 +28,7 @@
  * @brief Class @ref Magnum::DefaultFramebuffer
  */
 
-#include "AbstractFramebuffer.h"
+#include "Magnum/AbstractFramebuffer.h"
 
 namespace Magnum {
 

src/Magnum/DimensionTraits.h

@@ -24,8 +24,8 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "Math/Math.h"
-#include "Types.h"
+#include "Magnum/Math/Math.h"
+#include "Magnum/Types.h"
 
 /** @file
  * @brief Class Magnum::DimensionTraits

src/Magnum/Extensions.h

@@ -28,7 +28,7 @@
  * @brief Namespace Magnum::Extensions
  */
 
-#include "Version.h"
+#include "Magnum/Version.h"
 
 namespace Magnum {
 

src/Magnum/Framebuffer.cpp

@@ -24,12 +24,12 @@
 
 #include "Framebuffer.h"
 
-#include "BufferImage.h"
-#include "Context.h"
-#include "Extensions.h"
-#include "Image.h"
-#include "Renderbuffer.h"
-#include "Texture.h"
+#include "Magnum/BufferImage.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
+#include "Magnum/Image.h"
+#include "Magnum/Renderbuffer.h"
+#include "Magnum/Texture.h"
 
 #include "Implementation/DebugState.h"
 #include "Implementation/State.h"

src/Magnum/Framebuffer.h

@@ -28,8 +28,8 @@
  * @brief Class @ref Magnum::Framebuffer
  */
 
-#include "AbstractFramebuffer.h"
-#include "CubeMapTexture.h"
+#include "Magnum/AbstractFramebuffer.h"
+#include "Magnum/CubeMapTexture.h"
 
 #ifdef _X11_XLIB_H_ /* Xlib.h, I hate you sincerely */
 #undef Status

src/Magnum/Image.h

@@ -28,7 +28,7 @@
  * @brief Class @ref Magnum::Image, typedef @ref Magnum::Image1D, @ref Magnum::Image2D, @ref Magnum::Image3D
  */
 
-#include "ImageReference.h"
+#include "Magnum/ImageReference.h"
 
 namespace Magnum {
 

src/Magnum/ImageFormat.h

@@ -31,7 +31,7 @@
  */
 #endif
 
-#include "ColorFormat.h"
+#include "Magnum/ColorFormat.h"
 
 #ifdef MAGNUM_BUILD_DEPRECATED
 namespace Magnum {

src/Magnum/ImageReference.h

@@ -28,9 +28,9 @@
  * @brief Class @ref Magnum::ImageReference, typedef @ref Magnum::ImageReference1D, @ref Magnum::ImageReference2D, @ref Magnum::ImageReference3D
  */
 
-#include "Math/Vector3.h"
-#include "AbstractImage.h"
-#include "DimensionTraits.h"
+#include "Magnum/Math/Vector3.h"
+#include "Magnum/AbstractImage.h"
+#include "Magnum/DimensionTraits.h"
 
 namespace Magnum {
 

src/Magnum/Implementation/BufferState.h

@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "Buffer.h"
+#include "Magnum/Buffer.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Implementation/DebugState.cpp

@@ -24,9 +24,9 @@
 
 #include "DebugState.h"
 
-#include "AbstractObject.h"
-#include "Context.h"
-#include "Extensions.h"
+#include "Magnum/AbstractObject.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Implementation/DebugState.h

@@ -26,7 +26,7 @@
 
 #include <string>
 
-#include "DebugMessage.h"
+#include "Magnum/DebugMessage.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Implementation/FramebufferState.h

@@ -24,9 +24,9 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "Math/Range.h"
-#include "Magnum.h"
-#include "OpenGL.h"
+#include "Magnum/Magnum.h"
+#include "Magnum/OpenGL.h"
+#include "Magnum/Math/Range.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Implementation/MeshState.h

@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "Magnum.h"
+#include "Magnum/Magnum.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Implementation/RendererState.h

@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "Renderer.h"
+#include "Magnum/Renderer.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Implementation/ShaderProgramState.h

@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "OpenGL.h"
+#include "Magnum/OpenGL.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Implementation/ShaderState.h

@@ -24,9 +24,9 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "OpenGL.h"
-#include "Types.h"
-#include "magnumConfigure.h"
+#include "Magnum/OpenGL.h"
+#include "Magnum/Types.h"
+#include "Magnum/magnumConfigure.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Implementation/State.cpp

@@ -24,16 +24,17 @@
 
 #include "State.h"
 
-#include "Context.h"
-#include "Extensions.h"
-#include "Implementation/BufferState.h"
-#include "Implementation/DebugState.h"
-#include "Implementation/FramebufferState.h"
-#include "Implementation/MeshState.h"
-#include "Implementation/RendererState.h"
-#include "Implementation/ShaderState.h"
-#include "Implementation/ShaderProgramState.h"
-#include "Implementation/TextureState.h"
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
+
+#include "BufferState.h"
+#include "DebugState.h"
+#include "FramebufferState.h"
+#include "MeshState.h"
+#include "RendererState.h"
+#include "ShaderState.h"
+#include "ShaderProgramState.h"
+#include "TextureState.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Implementation/State.h

@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include "Magnum.h"
+#include "Magnum/Magnum.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Implementation/TextureState.h

@@ -26,7 +26,7 @@
 
 #include <vector>
 
-#include "OpenGL.h"
+#include "Magnum/OpenGL.h"
 
 namespace Magnum { namespace Implementation {
 

src/Magnum/Magnum.h

@@ -30,9 +30,9 @@
 
 #include <Corrade/Utility/Utility.h>
 
-#include "Math/Math.h"
-#include "Types.h"
-#include "magnumConfigure.h"
+#include "Magnum/Types.h"
+#include "Magnum/magnumConfigure.h"
+#include "Magnum/Math/Math.h"
 
 #ifdef MAGNUM_BUILD_DEPRECATED
 #include <Corrade/Utility/Macros.h>

src/Magnum/Math/Algorithms/GaussJordan.h

@@ -28,7 +28,7 @@
  * @brief Function Magnum::Math::Algorithms::gaussJordanInPlaceTransposed(), Magnum::Math::Algorithms::gaussJordanInPlace()
  */
 
-#include "Math/RectangularMatrix.h"
+#include "Magnum/Math/RectangularMatrix.h"
 
 namespace Magnum { namespace Math { namespace Algorithms {