diff --git a/src/ClientInternal.hxx b/src/ClientInternal.hxx
index f8944b657..5e41333e4 100644
--- a/src/ClientInternal.hxx
+++ b/src/ClientInternal.hxx
@@ -27,7 +27,7 @@
 
 #include <set>
 #include <string>
-#include <deque>
+#include <list>
 
 #include <glib.h>
 
@@ -97,7 +97,7 @@ public:
 	/**
 	 * A list of messages this client has received.
 	 */
-	std::deque<ClientMessage> messages;
+	std::list<ClientMessage> messages;
 
 	Client(struct player_control *player_control,
 	       int fd, int uid, int num);
diff --git a/src/InotifyQueue.cxx b/src/InotifyQueue.cxx
index a2e21272f..0d19ff083 100644
--- a/src/InotifyQueue.cxx
+++ b/src/InotifyQueue.cxx
@@ -21,7 +21,7 @@
 #include "InotifyQueue.hxx"
 #include "UpdateGlue.hxx"
 
-#include <deque>
+#include <list>
 #include <string>
 
 #include <glib.h>
@@ -40,7 +40,7 @@ enum {
 	INOTIFY_UPDATE_DELAY_S = 5,
 };
 
-static std::deque<std::string> inotify_queue;
+static std::list<std::string> inotify_queue;
 static guint queue_source_id;
 
 void