diff --git a/src/network/twitch.cpp b/src/network/twitch.cpp
index 5139669f29..6de95de67f 100644
--- a/src/network/twitch.cpp
+++ b/src/network/twitch.cpp
@@ -29,7 +29,7 @@
     #error HTTP must be enabled to use the TWITCH functionality.
 #endif
 
-#include "../core/List.hpp"
+#include <vector>
 #include "../core/Math.hpp"
 #include "../core/String.hpp"
 
@@ -119,7 +119,7 @@ namespace Twitch
     static void ParseMessages();
     static bool ShouldTrackMember(const AudienceMember * member);
     static bool ShouldMemberBeGuest(const AudienceMember * member);
-    static void ManageGuestNames(List<AudienceMember> &members);
+    static void ManageGuestNames(std::vector<AudienceMember> &members);
     static void ParseChatMessage(const char * message);
     static void DoChatMessageNews(const char * message);
 
@@ -328,7 +328,7 @@ namespace Twitch
         http_json_response *jsonResponse = _twitchJsonResponse;
         if (json_is_array(jsonResponse->root))
         {
-            List<AudienceMember> members;
+            std::vector<AudienceMember> members;
 
             size_t audienceCount = json_array_size(jsonResponse->root);
             for (size_t i = 0; i < audienceCount; i++)
@@ -340,7 +340,7 @@ namespace Twitch
                     member.ShouldTrack = ShouldTrackMember(&member);
                     if (ShouldMemberBeGuest(&member))
                     {
-                        members.Add(member);
+                        members.push_back(member);
                     }
                 }
             }
@@ -405,7 +405,7 @@ namespace Twitch
         return false;
     }
 
-    static void ManageGuestNames(List<AudienceMember> &members)
+    static void ManageGuestNames(std::vector<AudienceMember> &members)
     {
         // Check what followers are already in the park
         uint16 spriteIndex;
@@ -462,13 +462,13 @@ namespace Twitch
         }
 
         // Rename non-named peeps to followers that aren't currently in the park.
-        if (members.GetCount() > 0)
+        if (members.size() > 0)
         {
             size_t memberIndex = SIZE_MAX;
             FOR_ALL_GUESTS(spriteIndex, peep)
             {
                 size_t originalMemberIndex = memberIndex;
-                for (size_t i = memberIndex + 1; i < members.GetCount(); i++)
+                for (size_t i = memberIndex + 1; i < members.size(); i++)
                 {
                     if (!members[i].Exists)
                     {