diff --git a/src/AbstractImage.h b/src/AbstractImage.h
index a8d9f0c5c..3dea087db 100644
--- a/src/AbstractImage.h
+++ b/src/AbstractImage.h
@@ -72,9 +72,11 @@ class MAGNUM_EXPORT AbstractImage {
             #endif
 
             RGB = GL_RGB,                   /**< Three-component RGB */
-            RGBA = GL_RGBA,                 /**< Four-component RGBA */
+            RGBA = GL_RGBA                  /**< Four-component RGBA */
 
             #ifndef MAGNUM_TARGET_GLES
+            ,
+
             /**
              * Three-component BGR
              * @requires_gl
@@ -86,16 +88,19 @@ class MAGNUM_EXPORT AbstractImage {
              * @requires_gl
              */
             BGRA = GL_BGRA,
-            #endif
 
-            /** Depth component. For framebuffer reading only. */
+            /**
+             * Depth component. For framebuffer reading only.
+             * @requires_gl
+             */
             Depth = GL_DEPTH_COMPONENT,
 
-            /** Stencil index. For framebuffer reading only. */
-            StencilIndex = GL_STENCIL_INDEX
+            /**
+             * Stencil index. For framebuffer reading only.
+             * @requires_gl
+             */
+            StencilIndex = GL_STENCIL_INDEX,
 
-            #ifndef MAGNUM_TARGET_GLES
-            ,
             /**
              * Depth and stencil component. For framebuffer reading only.
              * @requires_gl
diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h
index f30f78cb3..ce766a7ab 100644
--- a/src/AbstractTexture.h
+++ b/src/AbstractTexture.h
@@ -344,10 +344,12 @@ class MAGNUM_EXPORT AbstractTexture {
              * Three-component RGB, unsigned normalized, red and blue 5bit,
              * green 6bit, 16bit total.
              */
-            RGB565 = GL_RGB565,
+            RGB565 = GL_RGB565
             #endif
 
             #ifndef MAGNUM_TARGET_GLES
+            ,
+
             /**
              * Three-component RGB, unsigned with exponent, each component
              * 9bit, exponent 5bit, 32bit total.
@@ -407,7 +409,6 @@ class MAGNUM_EXPORT AbstractTexture {
              * @requires_gl30 Extension @extension{EXT,texture_compression_rgtc}
              */
             CompressedRtgcSignedRedGreen = GL_COMPRESSED_SIGNED_RG_RGTC2,
-            #endif
 
             #if defined(GL_COMPRESSED_RGBA_BPTC_UNORM) || defined(DOXYGEN_GENERATING_OUTPUT)
             /**
@@ -444,10 +445,10 @@ class MAGNUM_EXPORT AbstractTexture {
              *
              * Prefer to use the exactly specified version of this format, in
              * this case e.g. `Format::Depth16`.
+             * @requires_gl
              */
             Depth = GL_DEPTH_COMPONENT,
 
-            #ifndef MAGNUM_TARGET_GLES
             /**
              * Depth and stencil component, at least 24bit depth and 8bit
              * stencil.
@@ -457,13 +458,12 @@ class MAGNUM_EXPORT AbstractTexture {
              * @requires_gl
              */
             DepthStencil = GL_DEPTH_STENCIL,
-            #endif
 
-            /** 16bit depth component. */
-            Depth16 = GL_DEPTH_COMPONENT16
-
-            #ifndef MAGNUM_TARGET_GLES
-            ,
+            /**
+             * 16bit depth component.
+             * @requires_gl
+             */
+            Depth16 = GL_DEPTH_COMPONENT16,
 
             /**
              * 24bit depth component.
diff --git a/src/Renderbuffer.h b/src/Renderbuffer.h
index b4c47b23a..11e3c98c4 100644
--- a/src/Renderbuffer.h
+++ b/src/Renderbuffer.h
@@ -92,10 +92,8 @@ class Renderbuffer {
             RGB565 = GL_RGB565,
             #endif
 
-            Depth = GL_DEPTH_COMPONENT,
-
             #ifndef MAGNUM_TARGET_GLES
-            DepthStencil = GL_DEPTH_STENCIL,
+            Depth = GL_DEPTH_COMPONENT, DepthStencil = GL_DEPTH_STENCIL,
             #endif
 
             Depth16 = GL_DEPTH_COMPONENT16