diff --git a/src/Magnum/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h
index dfa05dc66..13678bdbd 100644
--- a/src/Magnum/AbstractFramebuffer.h
+++ b/src/Magnum/AbstractFramebuffer.h
@@ -53,7 +53,7 @@ enum class FramebufferClear: GLbitfield {
 
 @see @ref AbstractFramebuffer::clear()
 */
-typedef Containers::EnumSet<FramebufferClear, GLbitfield,
+typedef Containers::EnumSet<FramebufferClear,
     GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT> FramebufferClearMask;
 
 /**
@@ -95,7 +95,7 @@ enum class FramebufferBlit: GLbitfield {
 @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} or
     @es_extension{NV,framebuffer_blit} in OpenGL ES 2.0
 */
-typedef Containers::EnumSet<FramebufferBlit, GLbitfield,
+typedef Containers::EnumSet<FramebufferBlit,
     GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT> FramebufferBlitMask;
 
 /**
diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h
index 8f56feb1b..bbe3dd29c 100644
--- a/src/Magnum/AbstractShaderProgram.h
+++ b/src/Magnum/AbstractShaderProgram.h
@@ -1122,7 +1122,7 @@ template<UnsignedInt location, class T> class AbstractShaderProgram::Attribute {
          * @see @ref Attribute()
          */
         #ifdef DOXYGEN_GENERATING_OUTPUT
-        typedef typename Containers::EnumSet<DataOption, UnsignedByte> DataOptions;
+        typedef typename Containers::EnumSet<DataOption> DataOptions;
         #else
         typedef typename Implementation::Attribute<T>::DataOptions DataOptions;
         #endif
@@ -1269,7 +1269,7 @@ struct FloatAttribute {
     enum class DataOption: UnsignedByte {
         Normalized = 1 << 0
     };
-    typedef Containers::EnumSet<DataOption, UnsignedByte> DataOptions;
+    typedef Containers::EnumSet<DataOption> DataOptions;
 
     static UnsignedInt MAGNUM_EXPORT size(GLint components, DataType dataType);
 };
@@ -1294,7 +1294,7 @@ struct IntAttribute {
     constexpr static DataType DefaultDataType = DataType::Int;
 
     enum class DataOption: UnsignedByte {};
-    typedef Containers::EnumSet<DataOption, UnsignedByte> DataOptions;
+    typedef Containers::EnumSet<DataOption> DataOptions;
 
     static UnsignedInt MAGNUM_EXPORT size(GLint components, DataType dataType);
 };
diff --git a/src/Magnum/Audio/AbstractImporter.h b/src/Magnum/Audio/AbstractImporter.h
index 40c388138..7bf4ad532 100644
--- a/src/Magnum/Audio/AbstractImporter.h
+++ b/src/Magnum/Audio/AbstractImporter.h
@@ -79,7 +79,7 @@ class MAGNUM_AUDIO_EXPORT AbstractImporter: public PluginManager::AbstractPlugin
          *
          * @see @ref features()
          */
-        typedef Containers::EnumSet<Feature, UnsignedByte> Features;
+        typedef Containers::EnumSet<Feature> Features;
 
         /** @brief Default constructor */
         explicit AbstractImporter();
diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h
index 297c9f0d2..a993584a2 100644
--- a/src/Magnum/Buffer.h
+++ b/src/Magnum/Buffer.h
@@ -434,7 +434,7 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
          * @requires_gles30 %Extension @es_extension{EXT,map_buffer_range} in
          *      OpenGL ES 2.0
          */
-        typedef Containers::EnumSet<MapFlag, GLbitfield> MapFlags;
+        typedef Containers::EnumSet<MapFlag> MapFlags;
 
         #ifndef MAGNUM_TARGET_GLES
         /**
diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h
index ec6b26c80..0b9d69078 100644
--- a/src/Magnum/Context.h
+++ b/src/Magnum/Context.h
@@ -160,14 +160,14 @@ class MAGNUM_EXPORT Context {
          *
          * @see @ref resetState()
          */
-        typedef Containers::EnumSet<State, UnsignedInt> States;
+        typedef Containers::EnumSet<State> States;
 
         /**
          * @brief %Context flags
          *
          * @see @ref flags()
          */
-        typedef Containers::EnumSet<Flag, GLint> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
 
         /**
          * @brief Constructor
diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h
index 2d95ec5cc..89ef9b35a 100644
--- a/src/Magnum/Platform/AbstractXApplication.h
+++ b/src/Magnum/Platform/AbstractXApplication.h
@@ -174,7 +174,7 @@ class AbstractXApplication {
             Exit = 1 << 1
         };
 
-        typedef Containers::EnumSet<Flag, unsigned int> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
         CORRADE_ENUMSET_FRIEND_OPERATORS(Flags)
 
         Display* display;
@@ -272,7 +272,7 @@ class AbstractXApplication::InputEvent {
          *
          * @see @ref modifiers()
          */
-        typedef Containers::EnumSet<Modifier, unsigned int> Modifiers;
+        typedef Containers::EnumSet<Modifier> Modifiers;
 
         /**
          * @brief Mouse button
@@ -290,7 +290,7 @@ class AbstractXApplication::InputEvent {
          *
          * @see @ref buttons()
          */
-        typedef Containers::EnumSet<Button, unsigned int> Buttons;
+        typedef Containers::EnumSet<Button> Buttons;
 
         /** @brief Copying is not allowed */
         InputEvent(const InputEvent&) = delete;
diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h
index 72a4883bf..d7aebb9d7 100644
--- a/src/Magnum/Platform/AndroidApplication.h
+++ b/src/Magnum/Platform/AndroidApplication.h
@@ -294,7 +294,7 @@ class AndroidApplication {
         enum class Flag: UnsignedByte {
             Redraw = 1 << 0
         };
-        typedef Containers::EnumSet<Flag, UnsignedByte> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
 
         static void commandEvent(android_app* state, std::int32_t cmd);
         static std::int32_t inputEvent(android_app* state, AInputEvent* event);
@@ -539,7 +539,7 @@ class AndroidApplication::MouseMoveEvent: public InputEvent {
          *
          * @see @ref buttons()
          */
-        typedef Containers::EnumSet<Button, std::int32_t> Buttons;
+        typedef Containers::EnumSet<Button> Buttons;
 
         /** @brief Position */
         Vector2i position() const {
diff --git a/src/Magnum/Platform/GlutApplication.h b/src/Magnum/Platform/GlutApplication.h
index fbf9839a1..e537e47d3 100644
--- a/src/Magnum/Platform/GlutApplication.h
+++ b/src/Magnum/Platform/GlutApplication.h
@@ -295,9 +295,9 @@ class GlutApplication::Configuration {
          * @see @ref setFlags()
          */
         #ifndef DOXYGEN_GENERATING_OUTPUT
-        typedef Containers::EnumSet<Flag, int, GLUT_DEBUG> Flags;
+        typedef Containers::EnumSet<Flag, GLUT_DEBUG> Flags;
         #else
-        typedef Containers::EnumSet<Flag, int> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
         #endif
 
         /*implicit*/ Configuration();
@@ -583,7 +583,7 @@ class GlutApplication::MouseMoveEvent: public GlutApplication::InputEvent {
          *
          * @see @ref buttons()
          */
-        typedef Containers::EnumSet<Button, UnsignedByte> Buttons;
+        typedef Containers::EnumSet<Button> Buttons;
 
         /** @brief Position */
         constexpr Vector2i position() const { return _position; }
diff --git a/src/Magnum/Platform/NaClApplication.h b/src/Magnum/Platform/NaClApplication.h
index 247b49907..f867cd832 100644
--- a/src/Magnum/Platform/NaClApplication.h
+++ b/src/Magnum/Platform/NaClApplication.h
@@ -360,7 +360,7 @@ class NaClApplication: public pp::Instance, public pp::Graphics3DClient, public
             WillBeFullscreen = 1 << 3,
             MouseLocked = 1 << 4
         };
-        typedef Containers::EnumSet<Flag, UnsignedByte> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
 
         void Graphics3DContextLost() override {
             CORRADE_ASSERT(false, "NaClApplication: context unexpectedly lost", );
@@ -482,7 +482,7 @@ class NaClApplication::InputEvent {
          *
          * @see @ref modifiers()
          */
-        typedef Containers::EnumSet<Modifier, std::uint32_t> Modifiers;
+        typedef Containers::EnumSet<Modifier> Modifiers;
 
         /**
          * @brief Mouse button
@@ -500,7 +500,7 @@ class NaClApplication::InputEvent {
          *
          * @see @ref buttons()
          */
-        typedef Containers::EnumSet<Button, std::uint32_t> Buttons;
+        typedef Containers::EnumSet<Button> Buttons;
 
         /** @brief Copying is not allowed */
         InputEvent(const InputEvent&) = delete;
diff --git a/src/Magnum/Platform/Screen.h b/src/Magnum/Platform/Screen.h
index c203c53ef..1178e9a2b 100644
--- a/src/Magnum/Platform/Screen.h
+++ b/src/Magnum/Platform/Screen.h
@@ -41,7 +41,7 @@ namespace Implementation {
         Input = 1 << 1
     };
 
-    typedef Containers::EnumSet<PropagatedScreenEvent, UnsignedByte> PropagatedScreenEvents;
+    typedef Containers::EnumSet<PropagatedScreenEvent> PropagatedScreenEvents;
     CORRADE_ENUMSET_OPERATORS(PropagatedScreenEvents)
 }
 
@@ -101,7 +101,7 @@ template<class Application> class BasicScreen: private Containers::LinkedListIte
          *
          * @see @ref setPropagatedEvents()
          */
-        typedef Containers::EnumSet<PropagatedEvent, UnsignedByte> PropagatedEvents;
+        typedef Containers::EnumSet<PropagatedEvent> PropagatedEvents;
         #else
         typedef Implementation::PropagatedScreenEvent PropagatedEvent;
         typedef Implementation::PropagatedScreenEvents PropagatedEvents;
diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h
index 869921232..da2067807 100644
--- a/src/Magnum/Platform/Sdl2Application.h
+++ b/src/Magnum/Platform/Sdl2Application.h
@@ -389,7 +389,7 @@ class Sdl2Application {
             #endif
         };
 
-        typedef Containers::EnumSet<Flag, UnsignedByte> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
         CORRADE_ENUMSET_FRIEND_OPERATORS(Flags)
 
         #ifdef CORRADE_TARGET_EMSCRIPTEN
@@ -445,10 +445,10 @@ class Sdl2Application::Configuration {
          * @see @ref setFlags()
          */
         #ifndef DOXYGEN_GENERATING_OUTPUT
-        typedef Containers::EnumSet<Flag, int, SDL_GL_CONTEXT_DEBUG_FLAG|
+        typedef Containers::EnumSet<Flag, SDL_GL_CONTEXT_DEBUG_FLAG|
             SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG> Flags;
         #else
-        typedef Containers::EnumSet<Flag, int> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
         #endif
         #endif
 
@@ -472,11 +472,11 @@ class Sdl2Application::Configuration {
          * @see @ref setWindowFlags()
          */
         #ifndef DOXYGEN_GENERATING_OUTPUT
-        typedef Containers::EnumSet<WindowFlag, Uint32, SDL_WINDOW_RESIZABLE|
+        typedef Containers::EnumSet<WindowFlag, SDL_WINDOW_RESIZABLE|
             SDL_WINDOW_FULLSCREEN|SDL_WINDOW_HIDDEN|SDL_WINDOW_MAXIMIZED|
             SDL_WINDOW_MINIMIZED|SDL_WINDOW_INPUT_GRABBED> WindowFlags;
         #else
-        typedef Containers::EnumSet<WindowFlag, Uint32> WindowFlags;
+        typedef Containers::EnumSet<WindowFlag> WindowFlags;
         #endif
 
         /*implicit*/ Configuration();
@@ -648,7 +648,7 @@ class Sdl2Application::InputEvent {
          * @see @ref KeyEvent::modifiers(), @ref MouseEvent::modifiers(),
          *      @ref MouseMoveEvent::modifiers()
          */
-        typedef Containers::EnumSet<Modifier, Uint16> Modifiers;
+        typedef Containers::EnumSet<Modifier> Modifiers;
 
         /** @brief Copying is not allowed */
         InputEvent(const InputEvent&) = delete;
@@ -857,7 +857,7 @@ class Sdl2Application::MouseMoveEvent: public Sdl2Application::InputEvent {
          *
          * @see @ref buttons()
          */
-        typedef Containers::EnumSet<Button, Uint32> Buttons;
+        typedef Containers::EnumSet<Button> Buttons;
 
         /** @brief Position */
         constexpr Vector2i position() const { return _position; }
diff --git a/src/Magnum/Primitives/Cylinder.h b/src/Magnum/Primitives/Cylinder.h
index dcae34469..241379d1f 100644
--- a/src/Magnum/Primitives/Cylinder.h
+++ b/src/Magnum/Primitives/Cylinder.h
@@ -59,7 +59,7 @@ class MAGNUM_PRIMITIVES_EXPORT Cylinder {
          *
          * @see @ref solid(), @ref wireframe()
          */
-        typedef Containers::EnumSet<Flag, int> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
 
         /**
          * @brief Solid cylinder
diff --git a/src/Magnum/SceneGraph/AbstractFeature.h b/src/Magnum/SceneGraph/AbstractFeature.h
index 37ca209a7..6a81f36d1 100644
--- a/src/Magnum/SceneGraph/AbstractFeature.h
+++ b/src/Magnum/SceneGraph/AbstractFeature.h
@@ -71,7 +71,7 @@ enum class CachedTransformation: UnsignedByte {
 @see @ref scenegraph-caching, @ref AbstractFeature::setCachedTransformations(),
     @ref AbstractFeature::clean(), @ref AbstractFeature::cleanInverted()
 */
-typedef Containers::EnumSet<CachedTransformation, UnsignedByte> CachedTransformations;
+typedef Containers::EnumSet<CachedTransformation> CachedTransformations;
 
 CORRADE_ENUMSET_OPERATORS(CachedTransformations)
 
diff --git a/src/Magnum/SceneGraph/Object.h b/src/Magnum/SceneGraph/Object.h
index 662b837f5..cfa7d6ddc 100644
--- a/src/Magnum/SceneGraph/Object.h
+++ b/src/Magnum/SceneGraph/Object.h
@@ -44,7 +44,7 @@ namespace Implementation {
         Joint = 1 << 2
     };
 
-    typedef Containers::EnumSet<ObjectFlag, UnsignedByte> ObjectFlags;
+    typedef Containers::EnumSet<ObjectFlag> ObjectFlags;
 
     CORRADE_ENUMSET_OPERATORS(ObjectFlags)
 }
diff --git a/src/Magnum/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h
index 8b1c687e3..f87a56b24 100644
--- a/src/Magnum/Shaders/Flat.h
+++ b/src/Magnum/Shaders/Flat.h
@@ -40,7 +40,7 @@ namespace Magnum { namespace Shaders {
 
 namespace Implementation {
     enum class FlatFlag: UnsignedByte { Textured = 1 << 0 };
-    typedef Containers::EnumSet<FlatFlag, UnsignedByte> FlatFlags;
+    typedef Containers::EnumSet<FlatFlag> FlatFlags;
 }
 
 /**
@@ -97,7 +97,7 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT Flat: public Abstra
          *
          * @see @ref flags()
          */
-        typedef Containers::EnumSet<Flag, UnsignedByte> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
         #else
         typedef Implementation::FlatFlag Flag;
         typedef Implementation::FlatFlags Flags;
diff --git a/src/Magnum/Shaders/MeshVisualizer.h b/src/Magnum/Shaders/MeshVisualizer.h
index 7239e7caa..594e3409c 100644
--- a/src/Magnum/Shaders/MeshVisualizer.h
+++ b/src/Magnum/Shaders/MeshVisualizer.h
@@ -106,7 +106,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizer: public AbstractShaderProgram {
         };
 
         /** @brief %Flags */
-        typedef Containers::EnumSet<Flag, UnsignedByte> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
 
         /**
          * @brief Constructor
diff --git a/src/Magnum/Shaders/Phong.h b/src/Magnum/Shaders/Phong.h
index 44a2799ac..3b15bc1cc 100644
--- a/src/Magnum/Shaders/Phong.h
+++ b/src/Magnum/Shaders/Phong.h
@@ -106,7 +106,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public AbstractShaderProgram {
          *
          * @see @ref flags()
          */
-        typedef Containers::EnumSet<Flag, UnsignedByte> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
 
         /**
          * @brief Constructor
diff --git a/src/Magnum/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h
index 7b033eeda..c4081783e 100644
--- a/src/Magnum/Text/AbstractFont.h
+++ b/src/Magnum/Text/AbstractFont.h
@@ -100,7 +100,7 @@ class MAGNUM_TEXT_EXPORT AbstractFont: public PluginManager::AbstractPlugin {
         };
 
         /** @brief Set of features supported by this importer */
-        typedef Containers::EnumSet<Feature, UnsignedByte> Features;
+        typedef Containers::EnumSet<Feature> Features;
 
         /** @brief Default constructor */
         explicit AbstractFont();
diff --git a/src/Magnum/Text/AbstractFontConverter.h b/src/Magnum/Text/AbstractFontConverter.h
index 4247de6fb..dffa6958d 100644
--- a/src/Magnum/Text/AbstractFontConverter.h
+++ b/src/Magnum/Text/AbstractFontConverter.h
@@ -117,7 +117,7 @@ class MAGNUM_TEXT_EXPORT AbstractFontConverter: public PluginManager::AbstractPl
          *
          * @see @ref features()
          */
-        typedef Containers::EnumSet<Feature, UnsignedByte> Features;
+        typedef Containers::EnumSet<Feature> Features;
 
         /** @brief Default constructor */
         explicit AbstractFontConverter();
diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h
index 6352b171f..9d3029461 100644
--- a/src/Magnum/Trade/AbstractImageConverter.h
+++ b/src/Magnum/Trade/AbstractImageConverter.h
@@ -78,7 +78,7 @@ class MAGNUM_EXPORT AbstractImageConverter: public PluginManager::AbstractPlugin
          *
          * @see @ref features()
          */
-        typedef Containers::EnumSet<Feature, UnsignedByte> Features;
+        typedef Containers::EnumSet<Feature> Features;
 
         /** @brief Default constructor */
         explicit AbstractImageConverter();
diff --git a/src/Magnum/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h
index 7bb3482c6..c847ca88c 100644
--- a/src/Magnum/Trade/AbstractImporter.h
+++ b/src/Magnum/Trade/AbstractImporter.h
@@ -89,7 +89,7 @@ class MAGNUM_EXPORT AbstractImporter: public PluginManager::AbstractPlugin {
         };
 
         /** @brief Set of features supported by this importer */
-        typedef Containers::EnumSet<Feature, UnsignedByte> Features;
+        typedef Containers::EnumSet<Feature> Features;
 
         /** @brief Default constructor */
         explicit AbstractImporter();
diff --git a/src/Magnum/Trade/PhongMaterialData.h b/src/Magnum/Trade/PhongMaterialData.h
index 6cce3a13b..8c925adc2 100644
--- a/src/Magnum/Trade/PhongMaterialData.h
+++ b/src/Magnum/Trade/PhongMaterialData.h
@@ -62,7 +62,7 @@ class MAGNUM_EXPORT PhongMaterialData: public AbstractMaterialData {
          *
          * @see @ref flags()
          */
-        typedef Containers::EnumSet<Flag, UnsignedByte> Flags;
+        typedef Containers::EnumSet<Flag> Flags;
 
         /**
          * @brief Constructor