diff --git a/src/Query.h b/src/Query.h
index 21d0e5924..aebfddbfb 100644
--- a/src/Query.h
+++ b/src/Query.h
@@ -144,7 +144,7 @@ UnsignedInt primitiveCount = q.result<UnsignedInt>();
 class PrimitiveQuery: public AbstractQuery {
     public:
         /** @brief Query target */
-        enum Target: GLenum {
+        enum class Target: GLenum {
             #ifndef MAGNUM_TARGET_GLES
             /**
              * Count of primitives generated from vertex shader or geometry
@@ -210,7 +210,7 @@ q.endConditionalRender();
 class SampleQuery: public AbstractQuery {
     public:
         /** @brief Query target */
-        enum Target: GLenum {
+        enum class Target: GLenum {
             #ifndef MAGNUM_TARGET_GLES
             /**
              * Count of samples passed from fragment shader
diff --git a/src/Renderer.h b/src/Renderer.h
index 0ebcd1d90..f10b81a6a 100644
--- a/src/Renderer.h
+++ b/src/Renderer.h
@@ -278,7 +278,7 @@ class MAGNUM_EXPORT Renderer {
          *
          * @see setFrontFace()
          */
-        enum FrontFace: GLenum {
+        enum class FrontFace: GLenum {
             /** @brief Counterclockwise polygons are front facing (default). */
             CounterClockWise = GL_CCW,