diff --git a/src/Magnum/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h
new file mode 100644
index 000000000..1a5fb7292
--- /dev/null
+++ b/src/Magnum/AbstractFramebuffer.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_AbstractFramebuffer_h
+#define Magnum_AbstractFramebuffer_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/AbstractFramebuffer.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/AbstractFramebuffer.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/AbstractFramebuffer.h instead")
+#else
+#error use Magnum/GL/AbstractFramebuffer.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/AbstractObject.h b/src/Magnum/AbstractObject.h
new file mode 100644
index 000000000..5181c4a4b
--- /dev/null
+++ b/src/Magnum/AbstractObject.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_AbstractObject_h
+#define Magnum_AbstractObject_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/AbstractObject.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/AbstractObject.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/AbstractObject.h instead")
+#else
+#error use Magnum/GL/AbstractObject.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/AbstractQuery.h b/src/Magnum/AbstractQuery.h
new file mode 100644
index 000000000..1324c9fc5
--- /dev/null
+++ b/src/Magnum/AbstractQuery.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_AbstractQuery_h
+#define Magnum_AbstractQuery_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/AbstractQuery.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/AbstractQuery.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/AbstractQuery.h instead")
+#else
+#error use Magnum/GL/AbstractQuery.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h
new file mode 100644
index 000000000..dd8625aff
--- /dev/null
+++ b/src/Magnum/AbstractShaderProgram.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_AbstractShaderProgram_h
+#define Magnum_AbstractShaderProgram_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/AbstractShaderProgram.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/AbstractShaderProgram.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/AbstractShaderProgram.h instead")
+#else
+#error use Magnum/GL/AbstractShaderProgram.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/AbstractTexture.h b/src/Magnum/AbstractTexture.h
new file mode 100644
index 000000000..a67dcec21
--- /dev/null
+++ b/src/Magnum/AbstractTexture.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_AbstractTexture_h
+#define Magnum_AbstractTexture_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/AbstractTexture.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/AbstractTexture.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/AbstractTexture.h instead")
+#else
+#error use Magnum/GL/AbstractTexture.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Attribute.h b/src/Magnum/Attribute.h
new file mode 100644
index 000000000..fb3954dd9
--- /dev/null
+++ b/src/Magnum/Attribute.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Attribute_h
+#define Magnum_Attribute_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Attribute.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Attribute.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Attribute.h instead")
+#else
+#error use Magnum/GL/Attribute.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h
new file mode 100644
index 000000000..05c3f13e5
--- /dev/null
+++ b/src/Magnum/Buffer.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Buffer_h
+#define Magnum_Buffer_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Buffer.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Buffer.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Buffer.h instead")
+#else
+#error use Magnum/GL/Buffer.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/BufferImage.h b/src/Magnum/BufferImage.h
new file mode 100644
index 000000000..69b72567e
--- /dev/null
+++ b/src/Magnum/BufferImage.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_BufferImage_h
+#define Magnum_BufferImage_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/BufferImage.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/BufferImage.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/BufferImage.h instead")
+#else
+#error use Magnum/GL/BufferImage.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/BufferTexture.h b/src/Magnum/BufferTexture.h
new file mode 100644
index 000000000..e28f58057
--- /dev/null
+++ b/src/Magnum/BufferTexture.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_BufferTexture_h
+#define Magnum_BufferTexture_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/BufferTexture.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/BufferTexture.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/BufferTexture.h instead")
+#else
+#error use Magnum/GL/BufferTexture.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/BufferTextureFormat.h b/src/Magnum/BufferTextureFormat.h
new file mode 100644
index 000000000..7aa58670f
--- /dev/null
+++ b/src/Magnum/BufferTextureFormat.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_BufferTextureFormat_h
+#define Magnum_BufferTextureFormat_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/BufferTextureFormat.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/BufferTextureFormat.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/BufferTextureFormat.h instead")
+#else
+#error use Magnum/GL/BufferTextureFormat.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt
index b829435e7..0699a5b23 100644
--- a/src/Magnum/CMakeLists.txt
+++ b/src/Magnum/CMakeLists.txt
@@ -47,6 +47,78 @@ set(Magnum_HEADERS
     Types.h
     visibility.h)
 
+# Compatibility headers for GL library
+if(WITH_GL AND BUILD_DEPRECATED)
+    list(APPEND Magnum_HEADERS
+        AbstractFramebuffer.h
+        AbstractObject.h
+        AbstractShaderProgram.h
+        AbstractTexture.h
+        Attribute.h
+        Buffer.h
+        Context.h
+        CubeMapTexture.h
+        DefaultFramebuffer.h
+        Extensions.h
+        Framebuffer.h
+        Mesh.h
+        MeshView.h
+        OpenGL.h
+        PixelFormat.h
+        Renderbuffer.h
+        RenderbufferFormat.h
+        Renderer.h
+        Sampler.h
+        Shader.h
+        Tags.h
+        Texture.h
+        TextureFormat.h
+        Version.h)
+
+    # Desktop-only stuff
+    if(NOT TARGET_GLES)
+        list(APPEND Magnum_HEADERS RectangleTexture.h)
+    endif()
+
+    # OpenGL ES 3.0 and WebGL 2.0 stuff
+    if(NOT TARGET_GLES2)
+        list(APPEND Magnum_HEADERS
+            BufferImage.h
+            PrimitiveQuery.h
+            TextureArray.h
+            TransformFeedback.h)
+    endif()
+
+    # Desktop and OpenGL ES stuff that is not available in WebGL
+    if(NOT TARGET_WEBGL)
+        list(APPEND Magnum_HEADERS
+            DebugOutput.h
+            TimeQuery.h)
+
+        # Desktop and OpenGL ES 3.0 stuff that is not available in ES2 and WebGL
+        if(NOT TARGET_GLES2)
+            list(APPEND Magnum_HEADERS
+                BufferTexture.h
+                BufferTextureFormat.h
+                CubeMapTextureArray.h
+                ImageFormat.h
+                MultisampleTexture.h)
+        endif()
+    endif()
+
+    # Desktop, OpenGL ES and WebGL 2.0 stuff that is not available in WebGL 1.0
+    if(NOT (TARGET_WEBGL AND TARGET_GLES2))
+        list(APPEND Magnum_HEADERS
+            AbstractQuery.h
+            SampleQuery.h)
+    endif()
+endif()
+
+# Compatibility headers for OpenGLTester
+if(WITH_OPENGLTESTER AND BUILD_DEPRECATED)
+    list(APPEND Magnum_HEADERS OpenGLTester.h)
+endif()
+
 # Files shared between main library and math unit test library
 set(MagnumMath_SRCS
     Math/Color.cpp
diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h
new file mode 100644
index 000000000..aa7e9a679
--- /dev/null
+++ b/src/Magnum/Context.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Context_h
+#define Magnum_Context_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Context.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Context.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Context.h instead")
+#else
+#error use Magnum/GL/Context.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/CubeMapTexture.h b/src/Magnum/CubeMapTexture.h
new file mode 100644
index 000000000..f803ff8a5
--- /dev/null
+++ b/src/Magnum/CubeMapTexture.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_CubeMapTexture_h
+#define Magnum_CubeMapTexture_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/CubeMapTexture.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/CubeMapTexture.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/CubeMapTexture.h instead")
+#else
+#error use Magnum/GL/CubeMapTexture.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/CubeMapTextureArray.h b/src/Magnum/CubeMapTextureArray.h
new file mode 100644
index 000000000..1962d3e9d
--- /dev/null
+++ b/src/Magnum/CubeMapTextureArray.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_CubeMapTextureArray_h
+#define Magnum_CubeMapTextureArray_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/CubeMapTextureArray.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/CubeMapTextureArray.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/CubeMapTextureArray.h instead")
+#else
+#error use Magnum/GL/CubeMapTextureArray.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/DebugOutput.h b/src/Magnum/DebugOutput.h
new file mode 100644
index 000000000..d8d88ebdb
--- /dev/null
+++ b/src/Magnum/DebugOutput.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_DebugOutput_h
+#define Magnum_DebugOutput_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/DebugOutput.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/DebugOutput.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/DebugOutput.h instead")
+#else
+#error use Magnum/GL/DebugOutput.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/DefaultFramebuffer.h b/src/Magnum/DefaultFramebuffer.h
new file mode 100644
index 000000000..a85142fbb
--- /dev/null
+++ b/src/Magnum/DefaultFramebuffer.h
@@ -0,0 +1,40 @@
+#ifndef Magnum_DefaultFramebuffer_h
+#define Magnum_DefaultFramebuffer_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/DefaultFramebuffer.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/DefaultFramebuffer.h"
+#else
+#error use Magnum/GL/DefaultFramebuffer.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Extensions.h b/src/Magnum/Extensions.h
new file mode 100644
index 000000000..bdf430039
--- /dev/null
+++ b/src/Magnum/Extensions.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Extensions_h
+#define Magnum_Extensions_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Extensions.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Extensions.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Extensions.h instead")
+#else
+#error use Magnum/GL/Extensions.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Framebuffer.h b/src/Magnum/Framebuffer.h
new file mode 100644
index 000000000..10716fcca
--- /dev/null
+++ b/src/Magnum/Framebuffer.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Framebuffer_h
+#define Magnum_Framebuffer_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Framebuffer.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Framebuffer.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Framebuffer.h instead")
+#else
+#error use Magnum/GL/Framebuffer.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/GL/AbstractFramebuffer.h b/src/Magnum/GL/AbstractFramebuffer.h
index b96b5c24e..6398918ee 100644
--- a/src/Magnum/GL/AbstractFramebuffer.h
+++ b/src/Magnum/GL/AbstractFramebuffer.h
@@ -822,6 +822,49 @@ CORRADE_ENUMSET_OPERATORS(FramebufferClearMask)
 CORRADE_ENUMSET_OPERATORS(FramebufferBlitMask)
 #endif
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::FramebufferClear
+ * @deprecated Use @ref GL::FramebufferClear instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::FramebufferClear instead") Magnum::GL::FramebufferClear FramebufferClear;
+
+/** @brief @copybrief GL::FramebufferClearMask
+ * @deprecated Use @ref GL::FramebufferClearMask instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::FramebufferClearMask instead") Magnum::GL::FramebufferClearMask FramebufferClearMask;
+
+#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
+/** @brief @copybrief GL::FramebufferBlit
+ * @deprecated Use @ref GL::FramebufferBlit instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::FramebufferBlit instead") Magnum::GL::FramebufferBlit FramebufferBlit;
+
+/** @brief @copybrief GL::FramebufferBlitMask
+ * @deprecated Use @ref GL::FramebufferBlitMask instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::FramebufferBlitMask instead") Magnum::GL::FramebufferBlitMask FramebufferBlitMask;
+
+/** @brief @copybrief GL::FramebufferBlitFilter
+ * @deprecated Use @ref GL::FramebufferBlitFilter instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::FramebufferBlitFilter instead") Magnum::GL::FramebufferBlitFilter FramebufferBlitFilter;
+#endif
+
+/** @brief @copybrief GL::FramebufferTarget
+ * @deprecated Use @ref GL::FramebufferTarget instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::FramebufferTarget instead") Magnum::GL::FramebufferTarget FramebufferTarget;
+
+/** @brief @copybrief GL::AbstractFramebuffer
+ * @deprecated Use @ref GL::AbstractFramebuffer instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::AbstractFramebuffer instead") Magnum::GL::AbstractFramebuffer AbstractFramebuffer;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/AbstractObject.h b/src/Magnum/GL/AbstractObject.h
index 4a1792563..75fcfadf0 100644
--- a/src/Magnum/GL/AbstractObject.h
+++ b/src/Magnum/GL/AbstractObject.h
@@ -131,6 +131,27 @@ class MAGNUM_GL_EXPORT AbstractObject {
 
 CORRADE_ENUMSET_OPERATORS(ObjectFlags)
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::ObjectFlag
+ * @deprecated Use @ref GL::ObjectFlag instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::ObjectFlag instead") Magnum::GL::ObjectFlag ObjectFlag;
+
+/** @brief @copybrief GL::ObjectFlags
+ * @deprecated Use @ref GL::ObjectFlags instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::ObjectFlags instead") Magnum::GL::ObjectFlags ObjectFlags;
+
+/** @brief @copybrief GL::AbstractObject
+ * @deprecated Use @ref GL::AbstractObject instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::AbstractObject instead") Magnum::GL::AbstractObject AbstractObject;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/AbstractQuery.h b/src/Magnum/GL/AbstractQuery.h
index f6179ff2a..6e8f0ea38 100644
--- a/src/Magnum/GL/AbstractQuery.h
+++ b/src/Magnum/GL/AbstractQuery.h
@@ -224,7 +224,18 @@ inline GLuint AbstractQuery::release() {
     return id;
 }
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::AbstractQuery
+ * @deprecated Use @ref GL::AbstractQuery instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::AbstractQuery instead") Magnum::GL::AbstractQuery AbstractQuery;
+#endif
+
+}
 #else
 #error this header is not available in WebGL 1.0 build
 #endif
diff --git a/src/Magnum/GL/AbstractShaderProgram.h b/src/Magnum/GL/AbstractShaderProgram.h
index adf3e2847..b8fd95413 100644
--- a/src/Magnum/GL/AbstractShaderProgram.h
+++ b/src/Magnum/GL/AbstractShaderProgram.h
@@ -1300,6 +1300,17 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject {
         #endif
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::AbstractShaderProgram
+ * @deprecated Use @ref GL::AbstractShaderProgram instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::AbstractShaderProgram instead") Magnum::GL::AbstractShaderProgram AbstractShaderProgram;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/AbstractTexture.h b/src/Magnum/GL/AbstractTexture.h
index 72b34b804..57870990b 100644
--- a/src/Magnum/GL/AbstractTexture.h
+++ b/src/Magnum/GL/AbstractTexture.h
@@ -829,6 +829,17 @@ inline GLuint AbstractTexture::release() {
     return id;
 }
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::AbstractTexture
+ * @deprecated Use @ref GL::AbstractTexture instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::AbstractTexture instead") Magnum::GL::AbstractTexture AbstractTexture;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/Attribute.h b/src/Magnum/GL/Attribute.h
index 7fb390a74..5ed5b255f 100644
--- a/src/Magnum/GL/Attribute.h
+++ b/src/Magnum/GL/Attribute.h
@@ -796,6 +796,24 @@ template<class T> struct Attribute<Math::Matrix4<T>>: Attribute<Math::Matrix<4,
 
 }
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::Attribute
+ * @deprecated Use @ref GL::Attribute instead.
+ */
+#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
+template<UnsignedInt location, class T> using Attribute CORRADE_DEPRECATED_ALIAS("use GL::Attribute instead") = Magnum::GL::Attribute<location, T>;
+#endif
+
+/** @brief @copybrief GL::DynamicAttribute
+ * @deprecated Use @ref GL::DynamicAttribute instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::DynamicAttribute instead") Magnum::GL::DynamicAttribute DynamicAttribute;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/Buffer.h b/src/Magnum/GL/Buffer.h
index 85a2d7ba9..f723e18e8 100644
--- a/src/Magnum/GL/Buffer.h
+++ b/src/Magnum/GL/Buffer.h
@@ -1376,6 +1376,22 @@ template<class T> Containers::Array<T> inline Buffer::subData(const GLintptr off
 CORRADE_IGNORE_DEPRECATED_POP
 #endif
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::BufferUsage
+ * @deprecated Use @ref GL::BufferUsage instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::BufferUsage instead") Magnum::GL::BufferUsage BufferUsage;
+
+/** @brief @copybrief GL::Buffer
+ * @deprecated Use @ref GL::Buffer instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Buffer instead") Magnum::GL::Buffer Buffer;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/BufferImage.h b/src/Magnum/GL/BufferImage.h
index 147be6f9b..c308f319c 100644
--- a/src/Magnum/GL/BufferImage.h
+++ b/src/Magnum/GL/BufferImage.h
@@ -36,9 +36,9 @@
 #include "Magnum/GL/Buffer.h"
 #include "Magnum/Math/Vector4.h"
 
+#ifndef MAGNUM_TARGET_GLES2
 namespace Magnum { namespace GL {
 
-#ifndef MAGNUM_TARGET_GLES2
 /**
 @brief Buffer image
 
@@ -485,10 +485,60 @@ template<UnsignedInt dimensions> inline void CompressedBufferImage<dimensions>::
     setData({}, format, size, data, usage);
 }
 #endif
+
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::BufferImage
+ * @deprecated Use @ref GL::BufferImage instead.
+ */
+#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
+template<UnsignedInt dimensions> using BufferImage CORRADE_DEPRECATED_ALIAS("use GL::BufferImage instead") = Magnum::GL::BufferImage<dimensions>;
+#endif
+
+/** @brief @copybrief GL::BufferImage1D
+ * @deprecated Use @ref GL::BufferImage1D instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::BufferImage1D instead") Magnum::GL::BufferImage1D BufferImage1D;
+
+/** @brief @copybrief GL::BufferImage2D
+ * @deprecated Use @ref GL::BufferImage2D instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::BufferImage2D instead") Magnum::GL::BufferImage2D BufferImage2D;
+
+/** @brief @copybrief GL::BufferImage3D
+ * @deprecated Use @ref GL::BufferImage3D instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::BufferImage3D instead") Magnum::GL::BufferImage3D BufferImage3D;
+
+/** @brief @copybrief GL::CompressedBufferImage
+ * @deprecated Use @ref GL::CompressedBufferImage instead.
+ */
+#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
+template<UnsignedInt dimensions> using CompressedBufferImage CORRADE_DEPRECATED_ALIAS("use GL::CompressedBufferImage instead") = Magnum::GL::BufferImage<dimensions>;
+#endif
+
+/** @brief @copybrief GL::CompressedBufferImage1D
+ * @deprecated Use @ref GL::CompressedBufferImage1D instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::CompressedBufferImage1D instead") Magnum::GL::CompressedBufferImage1D CompressedBufferImage1D;
+
+/** @brief @copybrief GL::CompressedBufferImage2D
+ * @deprecated Use @ref GL::CompressedBufferImage2D instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::CompressedBufferImage2D instead") Magnum::GL::CompressedBufferImage2D CompressedBufferImage2D;
+
+/** @brief @copybrief GL::CompressedBufferImage3D
+ * @deprecated Use @ref GL::CompressedBufferImage3D instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::CompressedBufferImage3D instead") Magnum::GL::CompressedBufferImage3D CompressedBufferImage3D;
+#endif
+
+}
 #else
 #error this header is not available in OpenGL ES 2.0 build
 #endif
 
-}}
-
 #endif
diff --git a/src/Magnum/GL/BufferTexture.h b/src/Magnum/GL/BufferTexture.h
index 80e8ed955..2de3cab12 100644
--- a/src/Magnum/GL/BufferTexture.h
+++ b/src/Magnum/GL/BufferTexture.h
@@ -242,7 +242,18 @@ class MAGNUM_GL_EXPORT BufferTexture: public AbstractTexture {
         #endif
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::BufferTexture
+ * @deprecated Use @ref GL::BufferTexture instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::BufferTexture instead") Magnum::GL::BufferTexture BufferTexture;
+#endif
+
+}
 #else
 #error this header is not available in OpenGL ES 2.0 and WebGL build
 #endif
diff --git a/src/Magnum/GL/BufferTextureFormat.h b/src/Magnum/GL/BufferTextureFormat.h
index f9fbd1e56..8124040a6 100644
--- a/src/Magnum/GL/BufferTextureFormat.h
+++ b/src/Magnum/GL/BufferTextureFormat.h
@@ -171,7 +171,18 @@ enum class BufferTextureFormat: GLenum {
     RGBA32F = GL_RGBA32F
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::BufferTextureFormat
+ * @deprecated Use @ref GL::BufferTextureFormat instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::BufferTextureFormat instead") Magnum::GL::BufferTextureFormat BufferTextureFormat;
+#endif
+
+}
 #else
 #error this header is not available in OpenGL ES 2.0 and WebGL build
 #endif
diff --git a/src/Magnum/GL/Context.h b/src/Magnum/GL/Context.h
index 531b25d79..94ea8194b 100644
--- a/src/Magnum/GL/Context.h
+++ b/src/Magnum/GL/Context.h
@@ -747,6 +747,22 @@ Example usage:
     } while(0)
 #endif
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::Extension
+ * @deprecated Use @ref GL::Extension instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Extension instead") Magnum::GL::Extension Extension;
+
+/** @brief @copybrief GL::Context
+ * @deprecated Use @ref GL::Context instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Context instead") Magnum::GL::Context Context;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/CubeMapTexture.h b/src/Magnum/GL/CubeMapTexture.h
index 1100f3aac..ce5e73631 100644
--- a/src/Magnum/GL/CubeMapTexture.h
+++ b/src/Magnum/GL/CubeMapTexture.h
@@ -1120,6 +1120,22 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
         #endif
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::CubeMapCoordinate
+ * @deprecated Use @ref GL::CubeMapCoordinate instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::CubeMapCoordinate instead") Magnum::GL::CubeMapCoordinate CubeMapCoordinate;
+
+/** @brief @copybrief GL::CubeMapTexture
+ * @deprecated Use @ref GL::CubeMapTexture instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::CubeMapTexture instead") Magnum::GL::CubeMapTexture CubeMapTexture;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/CubeMapTextureArray.h b/src/Magnum/GL/CubeMapTextureArray.h
index b6a93d97d..77396e42e 100644
--- a/src/Magnum/GL/CubeMapTextureArray.h
+++ b/src/Magnum/GL/CubeMapTextureArray.h
@@ -779,7 +779,18 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
         explicit CubeMapTextureArray(GLuint id, ObjectFlags flags) noexcept: AbstractTexture{id, GL_TEXTURE_CUBE_MAP_ARRAY, flags} {}
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::CubeMapTextureArray
+ * @deprecated Use @ref GL::CubeMapTextureArray instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::CubeMapTextureArray instead") Magnum::GL::CubeMapTextureArray CubeMapTextureArray;
+#endif
+
+}
 #else
 #error this header is not available in OpenGL ES 2.0 and WebGL build
 #endif
diff --git a/src/Magnum/GL/DebugOutput.h b/src/Magnum/GL/DebugOutput.h
index e2449775b..bcbb29858 100644
--- a/src/Magnum/GL/DebugOutput.h
+++ b/src/Magnum/GL/DebugOutput.h
@@ -805,7 +805,28 @@ class MAGNUM_GL_EXPORT DebugGroup {
 /** @debugoperatorclassenum{DebugGroup,DebugGroup::Source} */
 MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, DebugGroup::Source value);
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::DebugOutput
+ * @deprecated Use @ref GL::DebugOutput instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::DebugOutput instead") Magnum::GL::DebugOutput DebugOutput;
+
+/** @brief @copybrief GL::DebugMessage
+ * @deprecated Use @ref GL::DebugMessage instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::DebugMessage instead") Magnum::GL::DebugMessage DebugMessage;
+
+/** @brief @copybrief GL::DebugGroup
+ * @deprecated Use @ref GL::DebugGroup instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::DebugGroup instead") Magnum::GL::DebugGroup DebugGroup;
+#endif
+
+}
 #else
 #error this header is not available in WebGL build
 #endif
diff --git a/src/Magnum/GL/DefaultFramebuffer.cpp b/src/Magnum/GL/DefaultFramebuffer.cpp
index 391a64819..abeda0099 100644
--- a/src/Magnum/GL/DefaultFramebuffer.cpp
+++ b/src/Magnum/GL/DefaultFramebuffer.cpp
@@ -35,7 +35,14 @@
 #include "Magnum/Math/Color.h"
 #endif
 
-namespace Magnum { namespace GL {
+namespace Magnum {
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Variable defined in Magnum/DefaultFramebuffer.h */
+MAGNUM_GL_EXPORT GL::DefaultFramebuffer& defaultFramebuffer = GL::defaultFramebuffer;
+#endif
+
+namespace GL {
 
 DefaultFramebuffer defaultFramebuffer;
 
diff --git a/src/Magnum/GL/DefaultFramebuffer.h b/src/Magnum/GL/DefaultFramebuffer.h
index 79bf190b9..e698bedb2 100644
--- a/src/Magnum/GL/DefaultFramebuffer.h
+++ b/src/Magnum/GL/DefaultFramebuffer.h
@@ -509,6 +509,22 @@ extern DefaultFramebuffer MAGNUM_GL_EXPORT defaultFramebuffer;
 /** @debugoperatorclassenum{DefaultFramebuffer,DefaultFramebuffer::Status} */
 MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, DefaultFramebuffer::Status value);
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::DefaultFramebuffer
+ * @deprecated Use @ref GL::DefaultFramebuffer instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::DefaultFramebuffer instead") Magnum::GL::DefaultFramebuffer DefaultFramebuffer;
+
+/** @brief @copybrief GL::defaultFramebuffer
+ * @deprecated Use @ref GL::defaultFramebuffer instead.
+ */
+extern CORRADE_DEPRECATED("use GL::defaultFramebuffer instead") MAGNUM_EXPORT Magnum::GL::DefaultFramebuffer& defaultFramebuffer;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/Extensions.h b/src/Magnum/GL/Extensions.h
index 0e1fe24b7..412fae910 100644
--- a/src/Magnum/GL/Extensions.h
+++ b/src/Magnum/GL/Extensions.h
@@ -475,6 +475,17 @@ namespace ANDROID {
 
 }
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/** @brief @copybrief GL::Extensions
+ * @deprecated Use @ref GL::Extensions instead.
+ */
+namespace CORRADE_DEPRECATED_NAMESPACE("use GL::Extensions instead") Extensions {
+    namespace GL = Magnum::GL::Extensions::GL;
+}
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/Framebuffer.h b/src/Magnum/GL/Framebuffer.h
index b9cbd41d9..d1d6b3736 100644
--- a/src/Magnum/GL/Framebuffer.h
+++ b/src/Magnum/GL/Framebuffer.h
@@ -964,6 +964,17 @@ inline GLuint Framebuffer::release() {
     return id;
 }
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::Framebuffer
+ * @deprecated Use @ref GL::Framebuffer instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Framebuffer instead") Magnum::GL::Framebuffer Framebuffer;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/ImageFormat.h b/src/Magnum/GL/ImageFormat.h
index 3b9c30282..eb37eb5ee 100644
--- a/src/Magnum/GL/ImageFormat.h
+++ b/src/Magnum/GL/ImageFormat.h
@@ -309,7 +309,23 @@ enum class ImageFormat: GLenum {
     #endif
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::ImageAccess
+ * @deprecated Use @ref GL::ImageAccess instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::ImageAccess instead") Magnum::GL::ImageAccess ImageAccess;
+
+/** @brief @copybrief GL::ImageFormat
+ * @deprecated Use @ref GL::ImageFormat instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::ImageFormat instead") Magnum::GL::ImageFormat ImageFormat;
+#endif
+
+}
 #else
 #error this header is not available in OpenGL ES 2.0 and WebGL build
 #endif
diff --git a/src/Magnum/GL/Mesh.h b/src/Magnum/GL/Mesh.h
index a8d49dc00..18dec0ab3 100644
--- a/src/Magnum/GL/Mesh.h
+++ b/src/Magnum/GL/Mesh.h
@@ -997,7 +997,23 @@ inline GLuint Mesh::release() {
     return id;
 }
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::MeshPrimitive
+ * @deprecated Use @ref GL::MeshPrimitive instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::MeshPrimitive instead") Magnum::GL::MeshPrimitive MeshPrimitive;
+
+/** @brief @copybrief GL::Mesh
+ * @deprecated Use @ref GL::Mesh instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Mesh instead") Magnum::GL::Mesh Mesh;
+#endif
+
+}
 
 namespace Corrade { namespace Utility {
 
diff --git a/src/Magnum/GL/MeshView.h b/src/Magnum/GL/MeshView.h
index 275d8430f..e385f3617 100644
--- a/src/Magnum/GL/MeshView.h
+++ b/src/Magnum/GL/MeshView.h
@@ -36,6 +36,10 @@
 #include "Magnum/GL/OpenGL.h"
 #include "Magnum/GL/visibility.h"
 
+#ifdef MAGNUM_BUILD_DEPRECATED
+#include <Corrade/Utility/Macros.h>
+#endif
+
 namespace Magnum { namespace GL {
 
 namespace Implementation { struct MeshState; }
@@ -306,6 +310,17 @@ inline MeshView& MeshView::setIndexRange(Int first, UnsignedInt start, UnsignedI
     return *this;
 }
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::MeshView
+ * @deprecated Use @ref GL::MeshView instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::MeshView instead") Magnum::GL::MeshView MeshView;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/MultisampleTexture.h b/src/Magnum/GL/MultisampleTexture.h
index 5242e8bcb..6a8051093 100644
--- a/src/Magnum/GL/MultisampleTexture.h
+++ b/src/Magnum/GL/MultisampleTexture.h
@@ -338,7 +338,35 @@ typedef MultisampleTexture<2> MultisampleTexture2D;
 */
 typedef MultisampleTexture<3> MultisampleTexture2DArray;
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::MultisampleTextureSampleLocations
+ * @deprecated Use @ref GL::MultisampleTextureSampleLocations instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::MultisampleTextureSampleLocations instead") Magnum::GL::MultisampleTextureSampleLocations MultisampleTextureSampleLocations;
+
+/** @brief @copybrief GL::MultisampleTexture
+ * @deprecated Use @ref GL::MultisampleTexture instead.
+ */
+#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
+template<UnsignedInt dimensions> using MultisampleTexture CORRADE_DEPRECATED_ALIAS("use GL::MultisampleTexture instead") = Magnum::GL::MultisampleTexture<dimensions>;
+#endif
+
+/** @brief @copybrief GL::MultisampleTexture2D
+ * @deprecated Use @ref GL::MultisampleTexture2D instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::MultisampleTexture2D instead") Magnum::GL::MultisampleTexture2D MultisampleTexture2D;
+
+/** @brief @copybrief GL::MultisampleTexture2DArray
+ * @deprecated Use @ref GL::MultisampleTexture2DArray instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::MultisampleTexture2DArray instead") Magnum::GL::MultisampleTexture2DArray MultisampleTexture2DArray;
+#endif
+
+}
 #else
 #error this header is not available in OpenGL ES 2.0 and WebGL build
 #endif
diff --git a/src/Magnum/GL/OpenGLTester.h b/src/Magnum/GL/OpenGLTester.h
index 1ab535cc4..182f9b612 100644
--- a/src/Magnum/GL/OpenGLTester.h
+++ b/src/Magnum/GL/OpenGLTester.h
@@ -275,6 +275,17 @@ Equivalent to
 */
 #define MAGNUM_VERIFY_NO_ERROR() CORRADE_COMPARE(Magnum::Renderer::error(), Magnum::Renderer::Error::NoError)
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::OpenGLTester
+ * @deprecated Use @ref GL::OpenGLTester instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::OpenGLTester instead") Magnum::GL::OpenGLTester OpenGLTester;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/PixelFormat.h b/src/Magnum/GL/PixelFormat.h
index 1b090982f..f9a4c58df 100644
--- a/src/Magnum/GL/PixelFormat.h
+++ b/src/Magnum/GL/PixelFormat.h
@@ -1243,6 +1243,27 @@ MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, PixelType value);
 /** @debugoperatorenum{CompressedPixelFormat} */
 MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, CompressedPixelFormat value);
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::PixelFormat
+ * @deprecated Use @ref GL::PixelFormat instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::PixelFormat instead") Magnum::GL::PixelFormat PixelFormat;
+
+/** @brief @copybrief GL::PixelType
+ * @deprecated Use @ref GL::PixelType instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::PixelType instead") Magnum::GL::PixelType PixelType;
+
+/** @brief @copybrief GL::CompressedPixelFormat
+ * @deprecated Use @ref GL::CompressedPixelFormat instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::CompressedPixelFormat instead") Magnum::GL::CompressedPixelFormat CompressedPixelFormat;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/PrimitiveQuery.h b/src/Magnum/GL/PrimitiveQuery.h
index b19b62d26..1cdfdedd7 100644
--- a/src/Magnum/GL/PrimitiveQuery.h
+++ b/src/Magnum/GL/PrimitiveQuery.h
@@ -206,7 +206,18 @@ class MAGNUM_GL_EXPORT PrimitiveQuery: public AbstractQuery {
         #endif
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::PrimitiveQuery
+ * @deprecated Use @ref GL::PrimitiveQuery instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::PrimitiveQuery instead") Magnum::GL::PrimitiveQuery PrimitiveQuery;
+#endif
+
+}
 #else
 #error this header is not available in OpenGL ES 2.0 build
 #endif
diff --git a/src/Magnum/GL/RectangleTexture.h b/src/Magnum/GL/RectangleTexture.h
index a4084acb9..c9f9b8f14 100644
--- a/src/Magnum/GL/RectangleTexture.h
+++ b/src/Magnum/GL/RectangleTexture.h
@@ -609,7 +609,18 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
         explicit RectangleTexture(GLuint id, ObjectFlags flags) noexcept: AbstractTexture{id, GL_TEXTURE_RECTANGLE, flags} {}
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::RectangleTexture
+ * @deprecated Use @ref GL::RectangleTexture instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::RectangleTexture instead") Magnum::GL::RectangleTexture RectangleTexture;
+#endif
+
+}
 #else
 #error this header is not available in OpenGL ES build
 #endif
diff --git a/src/Magnum/GL/Renderbuffer.h b/src/Magnum/GL/Renderbuffer.h
index 986e2ef82..ac7ddb30c 100644
--- a/src/Magnum/GL/Renderbuffer.h
+++ b/src/Magnum/GL/Renderbuffer.h
@@ -302,6 +302,17 @@ inline GLuint Renderbuffer::release() {
     return id;
 }
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::Renderbuffer
+ * @deprecated Use @ref GL::Renderbuffer instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Renderbuffer instead") Magnum::GL::Renderbuffer Renderbuffer;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/RenderbufferFormat.h b/src/Magnum/GL/RenderbufferFormat.h
index 48c39d07a..09e9d8a12 100644
--- a/src/Magnum/GL/RenderbufferFormat.h
+++ b/src/Magnum/GL/RenderbufferFormat.h
@@ -639,6 +639,17 @@ enum class RenderbufferFormat: GLenum {
     #endif
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::RenderbufferFormat
+ * @deprecated Use @ref GL::RenderbufferFormat instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::RenderbufferFormat instead") Magnum::GL::RenderbufferFormat RenderbufferFormat;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/Renderer.h b/src/Magnum/GL/Renderer.h
index fe6f92ce0..42a5b7b7e 100644
--- a/src/Magnum/GL/Renderer.h
+++ b/src/Magnum/GL/Renderer.h
@@ -1646,6 +1646,17 @@ MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, Renderer::ResetNotificationStra
 MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, Renderer::GraphicsResetStatus value);
 #endif
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::Renderer
+ * @deprecated Use @ref GL::Renderer instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Renderer instead") Magnum::GL::Renderer Renderer;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/SampleQuery.h b/src/Magnum/GL/SampleQuery.h
index 16c891554..6fd26608f 100644
--- a/src/Magnum/GL/SampleQuery.h
+++ b/src/Magnum/GL/SampleQuery.h
@@ -250,7 +250,18 @@ class SampleQuery: public AbstractQuery {
         explicit SampleQuery(GLuint id, Target target, ObjectFlags flags) noexcept: AbstractQuery{id, GLenum(target), flags} {}
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::SampleQuery
+ * @deprecated Use @ref GL::SampleQuery instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::SampleQuery instead") Magnum::GL::SampleQuery SampleQuery;
+#endif
+
+}
 #else
 #error this header is not available in WebGL 1.0 build
 #endif
diff --git a/src/Magnum/GL/Sampler.h b/src/Magnum/GL/Sampler.h
index 51a2c65ac..a67b769b5 100644
--- a/src/Magnum/GL/Sampler.h
+++ b/src/Magnum/GL/Sampler.h
@@ -297,6 +297,15 @@ MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, Sampler::CompareFunction value)
 MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, Sampler::DepthStencilMode value);
 #endif
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/** @brief @copybrief GL::Sampler
+ * @deprecated Use @ref GL::Sampler instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Sampler instead") GL::Sampler Sampler;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/Shader.h b/src/Magnum/GL/Shader.h
index 6576993b5..4a182dd71 100644
--- a/src/Magnum/GL/Shader.h
+++ b/src/Magnum/GL/Shader.h
@@ -645,6 +645,17 @@ inline Shader& Shader::operator=(Shader&& other) noexcept {
     return *this;
 }
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::Shader
+ * @deprecated Use @ref GL::Shader instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Shader instead") Magnum::GL::Shader Shader;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/Texture.h b/src/Magnum/GL/Texture.h
index 45f7f4e5b..f02c5bc1b 100644
--- a/src/Magnum/GL/Texture.h
+++ b/src/Magnum/GL/Texture.h
@@ -1300,6 +1300,38 @@ typedef Texture<2> Texture2D;
 typedef Texture<3> Texture3D;
 #endif
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::Texture
+ * @deprecated Use @ref GL::Texture instead.
+ */
+#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
+template<UnsignedInt dimensions> using Texture CORRADE_DEPRECATED_ALIAS("use GL::Texture instead") = Magnum::GL::Texture<dimensions>;
+#endif
+
+#ifndef MAGNUM_TARGET_GLES
+/** @brief @copybrief GL::Texture1D
+ * @deprecated Use @ref GL::Texture1D instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Texture1D instead") Magnum::GL::Texture1D Texture1D;
+#endif
+
+/** @brief @copybrief GL::Texture2D
+ * @deprecated Use @ref GL::Texture2D instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Texture2D instead") Magnum::GL::Texture2D Texture2D;
+
+#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
+/** @brief @copybrief GL::Texture3D
+ * @deprecated Use @ref GL::Texture3D instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Texture3D instead") Magnum::GL::Texture3D Texture3D;
+#endif
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/TextureArray.h b/src/Magnum/GL/TextureArray.h
index 29526fe14..63debdc6d 100644
--- a/src/Magnum/GL/TextureArray.h
+++ b/src/Magnum/GL/TextureArray.h
@@ -841,7 +841,32 @@ typedef TextureArray<1> Texture1DArray;
 */
 typedef TextureArray<2> Texture2DArray;
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::TextureArray
+ * @deprecated Use @ref GL::TextureArray instead.
+ */
+#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
+template<UnsignedInt dimensions> using TextureArray CORRADE_DEPRECATED_ALIAS("use GL::TextureArray instead") = Magnum::GL::TextureArray<dimensions>;
+#endif
+
+#ifndef MAGNUM_TARGET_GLES
+/** @brief @copybrief GL::Texture1DArray
+ * @deprecated Use @ref GL::Texture1DArray instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Texture1DArray instead") Magnum::GL::Texture1DArray Texture1DArray;
+#endif
+
+/** @brief @copybrief GL::Texture2DArray
+ * @deprecated Use @ref GL::Texture2DArray instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Texture2DArray instead") Magnum::GL::Texture2DArray Texture2DArray;
+#endif
+
+}
 #else
 #error this header is not available in OpenGL ES 2.0 build
 #endif
diff --git a/src/Magnum/GL/TextureFormat.h b/src/Magnum/GL/TextureFormat.h
index d9f8c9c87..40f54253d 100644
--- a/src/Magnum/GL/TextureFormat.h
+++ b/src/Magnum/GL/TextureFormat.h
@@ -1757,6 +1757,17 @@ enum class TextureFormat: GLenum {
     #endif
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::TextureFormat
+ * @deprecated Use @ref GL::TextureFormat instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::TextureFormat instead") Magnum::GL::TextureFormat TextureFormat;
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/GL/TimeQuery.h b/src/Magnum/GL/TimeQuery.h
index 68814412e..16f4a8c38 100644
--- a/src/Magnum/GL/TimeQuery.h
+++ b/src/Magnum/GL/TimeQuery.h
@@ -161,7 +161,18 @@ class TimeQuery: public AbstractQuery {
         explicit TimeQuery(GLuint id, Target target, ObjectFlags flags) noexcept: AbstractQuery{id, GLenum(target), flags} {}
 };
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::TimeQuery
+ * @deprecated Use @ref GL::TimeQuery instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::TimeQuery instead") Magnum::GL::TimeQuery TimeQuery;
+#endif
+
+}
 #else
 #error this header is not available in WebGL 1.0 build
 #endif
diff --git a/src/Magnum/GL/TransformFeedback.h b/src/Magnum/GL/TransformFeedback.h
index 31b9a5af7..f3dfa000f 100644
--- a/src/Magnum/GL/TransformFeedback.h
+++ b/src/Magnum/GL/TransformFeedback.h
@@ -459,7 +459,18 @@ inline GLuint TransformFeedback::release() {
     return id;
 }
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::TransformFeedback
+ * @deprecated Use @ref GL::TransformFeedback instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::TransformFeedback instead") Magnum::GL::TransformFeedback TransformFeedback;
+#endif
+
+}
 #else
 #error this header is not available in OpenGL ES 2.0 build
 #endif
diff --git a/src/Magnum/GL/Version.h b/src/Magnum/GL/Version.h
index 9466b24e0..56a482b60 100644
--- a/src/Magnum/GL/Version.h
+++ b/src/Magnum/GL/Version.h
@@ -160,6 +160,38 @@ constexpr bool isVersionES(Version) { return true; }
 /** @debugoperatorenum{Version} */
 MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, Version value);
 
-}}
+}
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+/* Note: needs to be prefixed with Magnum:: otherwise Doxygen can't find it */
+
+/** @brief @copybrief GL::Version
+ * @deprecated Use @ref GL::Version instead.
+ */
+typedef CORRADE_DEPRECATED("use GL::Version instead") Magnum::GL::Version Version;
+
+#ifdef DOXYGEN_GENERATING_OUTPUT
+/** @brief @copybrief GL::version(Int, Int)
+ * @deprecated Use @ref GL::version(Int, Int) instead.
+ */
+constexpr CORRADE_DEPRECATED("use GL::version() instead") GL::Version version(Int major, Int minor);
+
+/** @brief @copybrief GL::version(GL::Version)
+ * @deprecated Use @ref GL::version(GL::Version) instead.
+ */
+CORRADE_DEPRECATED("use GL::version() instead") std::pair<Int, Int> version(GL::Version version);
+
+/** @brief @copybrief GL::isVersionES()
+ * @deprecated Use @ref GL::isVersionES() instead.
+ */
+constexpr CORRADE_DEPRECATED("use GL::isVersionES() instead") bool isVersionES(GL::Version version);
+#else
+/* Defining the functions here again would cause ambiguity due to ADL */
+using GL::version;
+using GL::isVersionES;
+#endif
+#endif
+
+}
 
 #endif
diff --git a/src/Magnum/ImageFormat.h b/src/Magnum/ImageFormat.h
new file mode 100644
index 000000000..2ef1fcde8
--- /dev/null
+++ b/src/Magnum/ImageFormat.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_ImageFormat_h
+#define Magnum_ImageFormat_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/ImageFormat.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/ImageFormat.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/ImageFormat.h instead")
+#else
+#error use Magnum/GL/ImageFormat.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h
index 9ed0879f2..07b36203a 100644
--- a/src/Magnum/Magnum.h
+++ b/src/Magnum/Magnum.h
@@ -34,6 +34,10 @@
 #include "Magnum/Types.h"
 #include "Magnum/Math/Math.h"
 
+#ifdef MAGNUM_BUILD_DEPRECATED
+#include "Magnum/GL/GL.h"
+#endif
+
 #ifndef DOXYGEN_GENERATING_OUTPUT
 typedef unsigned int GLenum; /* Needed for *Format and *Type enums */
 #endif
@@ -707,6 +711,109 @@ class ResourceKey;
 template<class...> class ResourceManager;
 
 class Timeline;
+
+#ifdef MAGNUM_BUILD_DEPRECATED
+typedef CORRADE_DEPRECATED("use GL::AbstractFramebuffer instead") GL::AbstractFramebuffer AbstractFramebuffer;
+
+#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
+typedef CORRADE_DEPRECATED("use GL::AbstractQuery instead") GL::AbstractQuery AbstractQuery;
+#endif
+typedef CORRADE_DEPRECATED("use GL::AbstractShaderProgram instead") GL::AbstractShaderProgram AbstractShaderProgram;
+typedef CORRADE_DEPRECATED("use GL::AbstractTexture instead") GL::AbstractTexture AbstractTexture;
+
+template<UnsignedInt location, class T> using Attribute CORRADE_DEPRECATED_ALIAS("use GL::Attribute instead") = GL::Attribute<location, T>;
+
+typedef CORRADE_DEPRECATED("use GL::BufferUsage instead") GL::BufferUsage BufferUsage;
+typedef CORRADE_DEPRECATED("use GL::Buffer instead") GL::Buffer Buffer;
+
+#ifndef MAGNUM_TARGET_GLES2
+template<UnsignedInt dimensions> using BufferImage CORRADE_DEPRECATED_ALIAS("use GL::BufferImage instead") = GL::BufferImage<dimensions>;
+typedef CORRADE_DEPRECATED("use GL::BufferImage1D instead") GL::BufferImage1D BufferImage1D;
+typedef CORRADE_DEPRECATED("use GL::BufferImage2D instead") GL::BufferImage2D BufferImage2D;
+typedef CORRADE_DEPRECATED("use GL::BufferImage3D instead") GL::BufferImage3D BufferImage3D;
+
+template<UnsignedInt dimensions> using CompressedBufferImage CORRADE_DEPRECATED_ALIAS("use GL::CompressedBufferImage instead") = GL::BufferImage<dimensions>;
+typedef CORRADE_DEPRECATED("use GL::CompressedBufferImage1D instead") GL::CompressedBufferImage1D CompressedBufferImage1D;
+typedef CORRADE_DEPRECATED("use GL::CompressedBufferImage2D instead") GL::CompressedBufferImage2D CompressedBufferImage2D;
+typedef CORRADE_DEPRECATED("use GL::CompressedBufferImage3D instead") GL::CompressedBufferImage3D CompressedBufferImage3D;
+#endif
+
+#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
+typedef CORRADE_DEPRECATED("use GL::BufferTexture instead") GL::BufferTexture BufferTexture;
+typedef CORRADE_DEPRECATED("use GL::BufferTextureFormat instead") GL::BufferTextureFormat BufferTextureFormat;
+#endif
+
+typedef CORRADE_DEPRECATED("use GL::Context instead") GL::Context Context;
+
+typedef CORRADE_DEPRECATED("use GL::CubeMapTexture instead") GL::CubeMapTexture CubeMapTexture;
+typedef CORRADE_DEPRECATED("use GL::CubeMapCoordinate instead") GL::CubeMapCoordinate CubeMapCoordinate;
+#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
+typedef CORRADE_DEPRECATED("use GL::CubeMapTextureArray instead") GL::CubeMapTextureArray CubeMapTextureArray;
+#endif
+
+typedef CORRADE_DEPRECATED("use GL::Extension instead") GL::Extension Extension;
+typedef CORRADE_DEPRECATED("use GL::Framebuffer instead") GL::Framebuffer Framebuffer;
+
+#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
+typedef CORRADE_DEPRECATED("use GL::ImageAccess instead") GL::ImageAccess ImageAccess;
+typedef CORRADE_DEPRECATED("use GL::ImageFormat instead") GL::ImageFormat ImageFormat;
+#endif
+
+typedef CORRADE_DEPRECATED("use GL::MeshPrimitive instead") GL::MeshPrimitive MeshPrimitive;
+
+typedef CORRADE_DEPRECATED("use GL::Mesh instead") GL::Mesh Mesh;
+typedef CORRADE_DEPRECATED("use GL::MeshView instead") GL::MeshView MeshView;
+
+#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
+/* MultisampleTextureSampleLocations enum used only in the function */
+template<UnsignedInt dimensions> using MultisampleTexture CORRADE_DEPRECATED_ALIAS("use GL::MultisampleTexture instead") = GL::MultisampleTexture<dimensions>;
+typedef CORRADE_DEPRECATED("use GL::MultisampleTexture2D instead") GL::MultisampleTexture2D MultisampleTexture2D;
+typedef CORRADE_DEPRECATED("use GL::MultisampleTexture2DArray instead") GL::MultisampleTexture2DArray MultisampleTexture2DArray;
+#endif
+
+typedef CORRADE_DEPRECATED("use GL::PixelFormat instead") GL::PixelFormat PixelFormat;
+typedef CORRADE_DEPRECATED("use GL::PixelType instead") GL::PixelType PixelType;
+typedef CORRADE_DEPRECATED("use GL::CompressedPixelFormat instead") GL::CompressedPixelFormat CompressedPixelFormat;
+
+typedef CORRADE_DEPRECATED("use GL::PrimitiveQuery instead") GL::PrimitiveQuery PrimitiveQuery;
+typedef CORRADE_DEPRECATED("use GL::SampleQuery instead") GL::SampleQuery SampleQuery;
+typedef CORRADE_DEPRECATED("use GL::TimeQuery instead") GL::TimeQuery TimeQuery;
+
+#ifndef MAGNUM_TARGET_GLES
+typedef CORRADE_DEPRECATED("use GL::RectangleTexture instead") GL::RectangleTexture RectangleTexture;
+#endif
+
+typedef CORRADE_DEPRECATED("use GL::Renderbuffer instead") GL::Renderbuffer Renderbuffer;
+typedef CORRADE_DEPRECATED("use GL::RenderbufferFormat instead") GL::RenderbufferFormat RenderbufferFormat;
+
+typedef CORRADE_DEPRECATED("use GL::Sampler instead") GL::Sampler Sampler;
+typedef CORRADE_DEPRECATED("use GL::Shader instead") GL::Shader Shader;
+
+template<UnsignedInt dimensions> using Texture CORRADE_DEPRECATED_ALIAS("use GL::Texture instead") = GL::Texture<dimensions>;
+#ifndef MAGNUM_TARGET_GLES
+typedef CORRADE_DEPRECATED("use GL::Texture1D instead") GL::Texture1D Texture1D;
+#endif
+typedef CORRADE_DEPRECATED("use GL::Texture2D instead") GL::Texture2D Texture2D;
+#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
+typedef CORRADE_DEPRECATED("use GL::Texture3D instead") GL::Texture3D Texture3D;
+#endif
+
+#ifndef MAGNUM_TARGET_GLES2
+template<UnsignedInt dimensions> using TextureArray CORRADE_DEPRECATED_ALIAS("use GL::TextureArray instead") = GL::TextureArray<dimensions>;
+#ifndef MAGNUM_TARGET_GLES
+typedef CORRADE_DEPRECATED("use GL::Texture1DArray instead") GL::Texture1DArray Texture1DArray;
+#endif
+typedef CORRADE_DEPRECATED("use GL::Texture2DArray instead") GL::Texture2DArray Texture2DArray;
+#endif
+
+typedef CORRADE_DEPRECATED("use GL::TextureFormat instead") GL::TextureFormat TextureFormat;
+
+#ifndef MAGNUM_TARGET_GLES2
+typedef CORRADE_DEPRECATED("use GL::TransformFeedback instead") GL::TransformFeedback TransformFeedback;
+#endif
+
+typedef CORRADE_DEPRECATED("use GL::Version instead") GL::Version Version;
+#endif
 #endif
 
 }
diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h
new file mode 100644
index 000000000..d109acc23
--- /dev/null
+++ b/src/Magnum/Mesh.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Mesh_h
+#define Magnum_Mesh_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Mesh.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Mesh.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Mesh.h instead")
+#else
+#error use Magnum/GL/Mesh.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/MeshView.h b/src/Magnum/MeshView.h
new file mode 100644
index 000000000..6d2c25e40
--- /dev/null
+++ b/src/Magnum/MeshView.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_MeshView_h
+#define Magnum_MeshView_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/MeshView.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/MeshView.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/MeshView.h instead")
+#else
+#error use Magnum/GL/MeshView.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/MultisampleTexture.h b/src/Magnum/MultisampleTexture.h
new file mode 100644
index 000000000..4893d9522
--- /dev/null
+++ b/src/Magnum/MultisampleTexture.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_MultisampleTexture_h
+#define Magnum_MultisampleTexture_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/MultisampleTexture.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/MultisampleTexture.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/MultisampleTexture.h instead")
+#else
+#error use Magnum/GL/MultisampleTexture.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/OpenGL.h b/src/Magnum/OpenGL.h
new file mode 100644
index 000000000..03d55cc5f
--- /dev/null
+++ b/src/Magnum/OpenGL.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_OpenGL_h
+#define Magnum_OpenGL_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/OpenGL.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/OpenGL.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/OpenGL.h instead")
+#else
+#error use Magnum/GL/OpenGL.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/OpenGLTester.h b/src/Magnum/OpenGLTester.h
new file mode 100644
index 000000000..12fa192b6
--- /dev/null
+++ b/src/Magnum/OpenGLTester.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_OpenGLTester_h
+#define Magnum_OpenGLTester_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/OpenGLTester.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/OpenGLTester.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/OpenGLTester.h instead")
+#else
+#error use Magnum/GL/OpenGLTester.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/PixelFormat.h b/src/Magnum/PixelFormat.h
new file mode 100644
index 000000000..763118e29
--- /dev/null
+++ b/src/Magnum/PixelFormat.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_PixelFormat_h
+#define Magnum_PixelFormat_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/PixelFormat.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/PixelFormat.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/PixelFormat.h instead")
+#else
+#error use Magnum/GL/PixelFormat.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/PrimitiveQuery.h b/src/Magnum/PrimitiveQuery.h
new file mode 100644
index 000000000..8d536610c
--- /dev/null
+++ b/src/Magnum/PrimitiveQuery.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_PrimitiveQuery_h
+#define Magnum_PrimitiveQuery_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/PrimitiveQuery.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/PrimitiveQuery.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/PrimitiveQuery.h instead")
+#else
+#error use Magnum/GL/PrimitiveQuery.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/RectangleTexture.h b/src/Magnum/RectangleTexture.h
new file mode 100644
index 000000000..8da6fa335
--- /dev/null
+++ b/src/Magnum/RectangleTexture.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_RectangleTexture_h
+#define Magnum_RectangleTexture_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/RectangleTexture.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/RectangleTexture.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/RectangleTexture.h instead")
+#else
+#error use Magnum/GL/RectangleTexture.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Renderbuffer.h b/src/Magnum/Renderbuffer.h
new file mode 100644
index 000000000..6548cf071
--- /dev/null
+++ b/src/Magnum/Renderbuffer.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Renderbuffer_h
+#define Magnum_Renderbuffer_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Renderbuffer.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Renderbuffer.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Renderbuffer.h instead")
+#else
+#error use Magnum/GL/Renderbuffer.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/RenderbufferFormat.h b/src/Magnum/RenderbufferFormat.h
new file mode 100644
index 000000000..c25d55795
--- /dev/null
+++ b/src/Magnum/RenderbufferFormat.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_RenderbufferFormat_h
+#define Magnum_RenderbufferFormat_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/RenderbufferFormat.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/RenderbufferFormat.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/RenderbufferFormat.h instead")
+#else
+#error use Magnum/GL/RenderbufferFormat.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h
new file mode 100644
index 000000000..e1a618587
--- /dev/null
+++ b/src/Magnum/Renderer.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Renderer_h
+#define Magnum_Renderer_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Renderer.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Renderer.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Renderer.h instead")
+#else
+#error use Magnum/GL/Renderer.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/SampleQuery.h b/src/Magnum/SampleQuery.h
new file mode 100644
index 000000000..37f69e334
--- /dev/null
+++ b/src/Magnum/SampleQuery.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_SampleQuery_h
+#define Magnum_SampleQuery_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/SampleQuery.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/SampleQuery.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/SampleQuery.h instead")
+#else
+#error use Magnum/GL/SampleQuery.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Sampler.h b/src/Magnum/Sampler.h
new file mode 100644
index 000000000..982fec4c8
--- /dev/null
+++ b/src/Magnum/Sampler.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Sampler_h
+#define Magnum_Sampler_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Sampler.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Sampler.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Sampler.h instead")
+#else
+#error use Magnum/GL/Sampler.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Shader.h b/src/Magnum/Shader.h
new file mode 100644
index 000000000..2ac820b39
--- /dev/null
+++ b/src/Magnum/Shader.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Shader_h
+#define Magnum_Shader_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Shader.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Shader.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Shader.h instead")
+#else
+#error use Magnum/GL/Shader.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Texture.h b/src/Magnum/Texture.h
new file mode 100644
index 000000000..69be9bd21
--- /dev/null
+++ b/src/Magnum/Texture.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Texture_h
+#define Magnum_Texture_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Texture.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Texture.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Texture.h instead")
+#else
+#error use Magnum/GL/Texture.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/TextureArray.h b/src/Magnum/TextureArray.h
new file mode 100644
index 000000000..8b86f5402
--- /dev/null
+++ b/src/Magnum/TextureArray.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_TextureArray_h
+#define Magnum_TextureArray_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/TextureArray.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/TextureArray.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/TextureArray.h instead")
+#else
+#error use Magnum/GL/TextureArray.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/TextureFormat.h b/src/Magnum/TextureFormat.h
new file mode 100644
index 000000000..3ad050bde
--- /dev/null
+++ b/src/Magnum/TextureFormat.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_TextureFormat_h
+#define Magnum_TextureFormat_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/TextureFormat.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/TextureFormat.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/TextureFormat.h instead")
+#else
+#error use Magnum/GL/TextureFormat.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/TimeQuery.h b/src/Magnum/TimeQuery.h
new file mode 100644
index 000000000..767be33e0
--- /dev/null
+++ b/src/Magnum/TimeQuery.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_TimeQuery_h
+#define Magnum_TimeQuery_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/TimeQuery.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/TimeQuery.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/TimeQuery.h instead")
+#else
+#error use Magnum/GL/TimeQuery.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/TransformFeedback.h b/src/Magnum/TransformFeedback.h
new file mode 100644
index 000000000..cfcfd55ca
--- /dev/null
+++ b/src/Magnum/TransformFeedback.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_TransformFeedback_h
+#define Magnum_TransformFeedback_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/TransformFeedback.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/TransformFeedback.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/TransformFeedback.h instead")
+#else
+#error use Magnum/GL/TransformFeedback.h instead
+#endif
+
+#endif
diff --git a/src/Magnum/Version.h b/src/Magnum/Version.h
new file mode 100644
index 000000000..68a520c28
--- /dev/null
+++ b/src/Magnum/Version.h
@@ -0,0 +1,41 @@
+#ifndef Magnum_Version_h
+#define Magnum_Version_h
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+/** @file
+ * @deprecated Use @ref Magnum/GL/Version.h instead.
+ */
+
+#include "Magnum/configure.h"
+
+#if defined(MAGNUM_BUILD_DEPRECATED) && defined(MAGNUM_TARGET_GL)
+#include "Magnum/GL/Version.h"
+CORRADE_DEPRECATED_FILE("use Magnum/GL/Version.h instead")
+#else
+#error use Magnum/GL/Version.h instead
+#endif
+
+#endif