diff --git a/osu.Game/Configuration/DatabasedConfigManager.cs b/osu.Game/Configuration/DatabasedConfigManager.cs
index 1ef4c2527a..b3783b45a8 100644
--- a/osu.Game/Configuration/DatabasedConfigManager.cs
+++ b/osu.Game/Configuration/DatabasedConfigManager.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
@@ -9,8 +10,8 @@ using osu.Game.Rulesets;
 
 namespace osu.Game.Configuration
 {
-    public abstract class DatabasedConfigManager<T> : ConfigManager<T>
-        where T : struct
+    public abstract class DatabasedConfigManager<TLookup> : ConfigManager<TLookup>
+        where TLookup : struct, Enum
     {
         private readonly SettingsStore settings;
 
@@ -53,7 +54,7 @@ namespace osu.Game.Configuration
 
         private readonly List<DatabasedSetting> dirtySettings = new List<DatabasedSetting>();
 
-        protected override void AddBindable<TBindable>(T lookup, Bindable<TBindable> bindable)
+        protected override void AddBindable<TBindable>(TLookup lookup, Bindable<TBindable> bindable)
         {
             base.AddBindable(lookup, bindable);
 
diff --git a/osu.Game/Configuration/InMemoryConfigManager.cs b/osu.Game/Configuration/InMemoryConfigManager.cs
index b0dc6b0e9c..ccf697f680 100644
--- a/osu.Game/Configuration/InMemoryConfigManager.cs
+++ b/osu.Game/Configuration/InMemoryConfigManager.cs
@@ -1,12 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Configuration;
 
 namespace osu.Game.Configuration
 {
-    public class InMemoryConfigManager<T> : ConfigManager<T>
-        where T : struct
+    public class InMemoryConfigManager<TLookup> : ConfigManager<TLookup>
+        where TLookup : struct, Enum
     {
         public InMemoryConfigManager()
         {
diff --git a/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs b/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
index ed5fdf9809..0ff3455f00 100644
--- a/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
+++ b/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
@@ -1,12 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Configuration
 {
-    public abstract class RulesetConfigManager<T> : DatabasedConfigManager<T>, IRulesetConfigManager
-        where T : struct
+    public abstract class RulesetConfigManager<TLookup> : DatabasedConfigManager<TLookup>, IRulesetConfigManager
+        where TLookup : struct, Enum
     {
         protected RulesetConfigManager(SettingsStore settings, RulesetInfo ruleset, int? variant = null)
             : base(settings, ruleset, variant)
diff --git a/osu.Game/Skinning/SkinConfigManager.cs b/osu.Game/Skinning/SkinConfigManager.cs
index 896444d1d2..682138a2e9 100644
--- a/osu.Game/Skinning/SkinConfigManager.cs
+++ b/osu.Game/Skinning/SkinConfigManager.cs
@@ -1,11 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Configuration;
 
 namespace osu.Game.Skinning
 {
-    public class SkinConfigManager<T> : ConfigManager<T> where T : struct
+    public class SkinConfigManager<TLookup> : ConfigManager<TLookup> where TLookup : struct, Enum
     {
         protected override void PerformLoad()
         {