diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index 0d59486423..981e980d17 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -2049,7 +2049,8 @@ void NetPlayServer::AssignNewUserAPad(const Client& player)
 {
   for (PlayerId& mapping : m_pad_map)
   {
-    if (mapping == Unmapped)
+    // 0 means unmapped
+    if (mapping == 0)
     {
       mapping = player.pid;
       break;
diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h
index 0b54f30ba2..13a05ee070 100644
--- a/Source/Core/Core/NetPlayServer.h
+++ b/Source/Core/Core/NetPlayServer.h
@@ -103,12 +103,6 @@ private:
     AllExcept
   };
 
-  enum MappedState
-  {
-    Unmapped,
-    Mapped
-  };
-
   struct AsyncQueueEntry
   {
     sf::Packet packet;
diff --git a/Source/Core/Core/SyncIdentifier.h b/Source/Core/Core/SyncIdentifier.h
index a144eb58e1..5e984476f9 100644
--- a/Source/Core/Core/SyncIdentifier.h
+++ b/Source/Core/Core/SyncIdentifier.h
@@ -36,7 +36,7 @@ struct SyncIdentifier
 
 // The order of entries in this enum matters, as the lowest value is
 // treated as the "best" available option.
-enum class SyncIdentifierComparison
+enum class SyncIdentifierComparison : u8
 {
   SameGame,
   DifferentHash,