diff --git a/src/landscape.cpp b/src/landscape.cpp
index 16cd2107b9..4247753dbf 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -32,7 +32,7 @@
 #include "company_func.h"
 #include "pathfinder/npf/aystar.h"
 #include "saveload/saveload.h"
-#include <list>
+#include <deque>
 #include <set>
 
 #include "table/strings.h"
@@ -1118,7 +1118,7 @@ static bool FlowRiver(TileIndex spring, TileIndex begin)
 	SET_MARK(begin);
 
 	/* Breadth first search for the closest tile we can flow down to. */
-	std::list<TileIndex> queue;
+	std::deque<TileIndex> queue;
 	queue.push_back(begin);
 
 	bool found = false;
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 95c782c9e1..4588b41710 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -1626,7 +1626,7 @@ struct StationViewWindow : public Window {
 	 */
 	void SetDisplayedRow(const CargoDataEntry *data)
 	{
-		std::list<StationID> stations;
+		std::vector<StationID> stations;
 		const CargoDataEntry *parent = data->GetParent();
 		if (parent->GetParent() == NULL) {
 			this->displayed_rows.push_back(RowDisplay(&this->expanded_rows, data->GetCargo()));