diff --git a/aegisub/src/audio_display.h b/aegisub/src/audio_display.h
index c1a83f4c2..0a1e417e7 100644
--- a/aegisub/src/audio_display.h
+++ b/aegisub/src/audio_display.h
@@ -34,7 +34,7 @@
 ///
 
 #ifndef AGI_PRE
-#include <list>
+#include <deque>
 #include <map>
 #include <cstdint>
 
@@ -103,7 +103,7 @@ public:
 class AudioDisplay: public wxWindow {
 	agi::signal::Connection audio_open_connection;
 
-	std::list<agi::signal::Connection> connections;
+	std::deque<agi::signal::Connection> connections;
 	agi::Context *context;
 
 	/// The audio renderer manager
diff --git a/aegisub/src/auto4_base.h b/aegisub/src/auto4_base.h
index 8565d83af..068de46aa 100644
--- a/aegisub/src/auto4_base.h
+++ b/aegisub/src/auto4_base.h
@@ -32,12 +32,10 @@
 /// @ingroup scripting
 ///
 
-
 #pragma once
 
-
 #ifndef AGI_PRE
-#include <list>
+#include <deque>
 #include <vector>
 
 #include <wx/dialog.h>
@@ -232,7 +230,7 @@ namespace Automation4 {
 
 	/// Manager for scripts specified by a subtitle file
 	class LocalScriptManager : public ScriptManager {
-		std::list<agi::signal::Connection> slots;
+		std::deque<agi::signal::Connection> slots;
 		agi::Context *context;
 
 		void OnSubtitlesSave();
diff --git a/aegisub/src/video_box.h b/aegisub/src/video_box.h
index 46c41d5f9..e0eaf9c0e 100644
--- a/aegisub/src/video_box.h
+++ b/aegisub/src/video_box.h
@@ -33,7 +33,7 @@
 ///
 
 #ifndef AGI_PRE
-#include <list>
+#include <deque>
 
 #include <wx/panel.h>
 #endif
@@ -48,7 +48,7 @@ class wxTextCtrl;
 /// @class VideoBox
 /// @brief The box containing the video display and associated controls
 class VideoBox : public wxPanel {
-	std::list<agi::signal::Connection> slots;
+	std::deque<agi::signal::Connection> slots;
 	agi::Context *context;     ///< Project context
 	wxTextCtrl *VideoPosition; ///< Current frame/time
 	wxTextCtrl *VideoSubsPos;  ///< Time relative to the active subtitle line
diff --git a/aegisub/src/video_display.h b/aegisub/src/video_display.h
index 90b644d43..3e7791516 100644
--- a/aegisub/src/video_display.h
+++ b/aegisub/src/video_display.h
@@ -34,7 +34,7 @@
 
 
 #ifndef AGI_PRE
-#include <list>
+#include <deque>
 #include <memory>
 
 #include <wx/glcanvas.h>
@@ -66,7 +66,7 @@ namespace agi {
 /// @brief DOCME
 class VideoDisplay : public wxGLCanvas {
 	/// Signals the display is connected to
-	std::list<agi::signal::Connection> slots;
+	std::deque<agi::signal::Connection> slots;
 
 	const agi::OptionValue* autohideTools;