Move foreach macroses into separate file.

55 files changed, 71 insertions, 0 deletions

diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index 21b80d9bf..ebfc988ac 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -71,6 +71,8 @@
 
 #include "listeners/focuslistener.h"
 
+#include "utils/foreach.h"
+
 #include "debug.h"
 
 FocusHandler::FocusHandler() :
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 8063207c6..d1424b445 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -98,6 +98,7 @@
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/langs.h"
 #include "utils/sdlsharedhelper.h"
 #include "utils/timer.h"
diff --git a/src/gui/models/extendedlistmodel.h b/src/gui/models/extendedlistmodel.h
index 981a96897..307b4af80 100644
--- a/src/gui/models/extendedlistmodel.h
+++ b/src/gui/models/extendedlistmodel.h
@@ -23,6 +23,8 @@
 
 #include "gui/models/listmodel.h"
 
+#include "utils/foreach.h"
+
 #include "resources/image/image.h"
 
 class ExtendedListModel notfinal : public ListModel
diff --git a/src/gui/models/iconsmodel.h b/src/gui/models/iconsmodel.h
index 1e4709554..4028895fb 100644
--- a/src/gui/models/iconsmodel.h
+++ b/src/gui/models/iconsmodel.h
@@ -25,6 +25,8 @@
 
 #include "gui/models/listmodel.h"
 
+#include "utils/foreach.h"
+
 #include "resources/iteminfo.h"
 
 #include "resources/db/itemdb.h"
diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h
index 8be90ab12..a49a7cfc5 100644
--- a/src/gui/models/itemsmodel.h
+++ b/src/gui/models/itemsmodel.h
@@ -29,6 +29,8 @@
 
 #include "resources/db/itemdb.h"
 
+#include "utils/foreach.h"
+
 #include <list>
 
 #include "localconsts.h"
diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp
index a5c05388b..763b75390 100644
--- a/src/gui/models/shopitems.cpp
+++ b/src/gui/models/shopitems.cpp
@@ -25,6 +25,7 @@
 #include "resources/item/shopitem.h"
 
 #include "utils/dtor.h"
+#include "utils/foreach.h"
 
 #include "debug.h"
 
diff --git a/src/gui/models/skillmodel.cpp b/src/gui/models/skillmodel.cpp
index 102956897..0dcf9cedd 100644
--- a/src/gui/models/skillmodel.cpp
+++ b/src/gui/models/skillmodel.cpp
@@ -22,6 +22,8 @@
 
 #include "gui/models/skillmodel.h"
 
+#include "utils/foreach.h"
+
 #include "resources/skill/skilldata.h"
 
 #include "debug.h"
diff --git a/src/gui/models/touchactionmodel.cpp b/src/gui/models/touchactionmodel.cpp
index 983fc7065..7f6b68ef7 100644
--- a/src/gui/models/touchactionmodel.cpp
+++ b/src/gui/models/touchactionmodel.cpp
@@ -23,6 +23,8 @@
 
 #include "gui/models/touchactionmodel.h"
 
+#include "utils/foreach.h"
+
 #include <algorithm>
 
 #include "debug.h"
diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h
index 8156ec145..74bd44af1 100644
--- a/src/gui/models/updatelistmodel.h
+++ b/src/gui/models/updatelistmodel.h
@@ -27,6 +27,8 @@
 
 #include "net/serverinfo.h"
 
+#include "utils/foreach.h"
+
 #include "localconsts.h"
 
 class UpdateListModel final : public ListModel
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 25f8084e9..c7bd7612e 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -23,6 +23,7 @@
 
 #include "gui/palette.h"
 
+#include "utils/foreach.h"
 #include "utils/timer.h"
 
 #ifndef USE_SDL2
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp
index 4cafcca27..015134c9f 100644
--- a/src/gui/popups/beingpopup.cpp
+++ b/src/gui/popups/beingpopup.cpp
@@ -36,6 +36,7 @@
 #include "resources/chatobject.h"
 
 #include "utils/gettext.h"
+#include "utils/foreach.h"
 #include "utils/stringutils.h"
 
 #include "debug.h"
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 4b35b7118..5c5dfd19e 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -52,6 +52,8 @@
 #include "net/beinghandler.h"
 #include "net/net.h"
 
+#include "utils/foreach.h"
+
 #include "utils/translation/podict.h"
 
 #include "debug.h"
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 9150ad1a7..1ce1b7e30 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -48,6 +48,7 @@
 #include "resources/loaders/xmlloader.h"
 
 #include "utils/dtor.h"
+#include "utils/foreach.h"
 
 #include "debug.h"
 
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index ce48fea70..79e3758ac 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -25,6 +25,7 @@
 
 #include "configuration.h"
 
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index db236c5c8..1e9035cee 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -51,6 +51,7 @@
 #include "input/inputmanager.h"
 
 #include "utils/checkutils.h"
+#include "utils/foreach.h"
 
 #include "resources/map/map.h"
 #include "resources/map/mapitem.h"
diff --git a/src/gui/widgets/basiccontainer.cpp b/src/gui/widgets/basiccontainer.cpp
index 771ba83f4..768733ae5 100644
--- a/src/gui/widgets/basiccontainer.cpp
+++ b/src/gui/widgets/basiccontainer.cpp
@@ -63,6 +63,8 @@
 
 #include "gui/widgets/basiccontainer.h"
 
+#include "utils/foreach.h"
+
 #include "render/graphics.h"
 
 #include <algorithm>
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 08db7e3bf..7687737b5 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -45,6 +45,7 @@
 
 #include "utils/browserboxtools.h"
 #include "utils/checkutils.h"
+#include "utils/foreach.h"
 #include "utils/stringutils.h"
 #include "utils/timer.h"
 #include "utils/translation/podict.h"
diff --git a/src/gui/widgets/characterviewnormal.cpp b/src/gui/widgets/characterviewnormal.cpp
index c92ad7477..288428d60 100644
--- a/src/gui/widgets/characterviewnormal.cpp
+++ b/src/gui/widgets/characterviewnormal.cpp
@@ -24,6 +24,8 @@
 
 #include "gui/widgets/characterdisplay.h"
 
+#include "utils/foreach.h"
+
 #include "debug.h"
 
 CharacterViewNormal::CharacterViewNormal(CharSelectDialog *const widget,
diff --git a/src/gui/widgets/characterviewsmall.cpp b/src/gui/widgets/characterviewsmall.cpp
index a861e5033..81580f9e1 100644
--- a/src/gui/widgets/characterviewsmall.cpp
+++ b/src/gui/widgets/characterviewsmall.cpp
@@ -24,6 +24,7 @@
 #include "gui/widgets/characterdisplay.h"
 #include "gui/widgets/label.h"
 
+#include "utils/foreach.h"
 #include "utils/stringutils.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index 88f4addd4..afd165219 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -29,6 +29,7 @@
 #include "resources/loaders/imagesetloader.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 9628c2764..0bf590f6b 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -77,6 +77,8 @@
 
 #include "listeners/selectionlistener.h"
 
+#include "utils/foreach.h"
+
 #include "render/graphics.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/selldialog.cpp b/src/gui/widgets/selldialog.cpp
index 2d613fae8..68b9a039f 100644
--- a/src/gui/widgets/selldialog.cpp
+++ b/src/gui/widgets/selldialog.cpp
@@ -40,6 +40,7 @@
 #include "gui/widgets/slider.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/widgets/staticbrowserbox.cpp b/src/gui/widgets/staticbrowserbox.cpp
index ed9e1e17d..ef51660c0 100644
--- a/src/gui/widgets/staticbrowserbox.cpp
+++ b/src/gui/widgets/staticbrowserbox.cpp
@@ -45,6 +45,7 @@
 
 #include "utils/browserboxtools.h"
 #include "utils/checkutils.h"
+#include "utils/foreach.h"
 #include "utils/stringutils.h"
 #include "utils/translation/podict.h"
 
diff --git a/src/gui/widgets/statspage.cpp b/src/gui/widgets/statspage.cpp
index eca98b1c4..65d322c05 100644
--- a/src/gui/widgets/statspage.cpp
+++ b/src/gui/widgets/statspage.cpp
@@ -25,6 +25,8 @@
 
 #include "gui/widgets/attrs/derdisplay.h"
 
+#include "utils/foreach.h"
+
 #include "resources/db/statdb.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/statspagebasic.cpp b/src/gui/widgets/statspagebasic.cpp
index bdf90e14f..2996e5f12 100644
--- a/src/gui/widgets/statspagebasic.cpp
+++ b/src/gui/widgets/statspagebasic.cpp
@@ -28,6 +28,7 @@
 #include "gui/widgets/attrs/changedisplay.h"
 
 #include "utils/gettext.h"
+#include "utils/foreach.h"
 #include "utils/stringutils.h"
 
 #include "resources/db/statdb.h"
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 95ea305d6..f63772907 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -72,6 +72,7 @@
 #include "gui/widgets/tabs/tab.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tabs/setup_mods.cpp b/src/gui/widgets/tabs/setup_mods.cpp
index 7ee8f2f34..c3ca23245 100644
--- a/src/gui/widgets/tabs/setup_mods.cpp
+++ b/src/gui/widgets/tabs/setup_mods.cpp
@@ -31,6 +31,7 @@
 
 #include "resources/db/moddb.h"
 
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index 5bd13220b..017f465c7 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -34,6 +34,7 @@
 #include "gui/widgets/tabs/socialfriendsfunctor.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "localconsts.h"
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index 775e22c6f..8652a54fe 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -27,6 +27,7 @@
 #include "being/localplayer.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index f26e99421..ff8544232 100644
--- a/src/gui/widgets/tabs/socialguildtab2.h
+++ b/src/gui/widgets/tabs/socialguildtab2.h
@@ -29,6 +29,7 @@
 #include "being/localplayer.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index b24f8f411..d7f22c1f7 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -31,6 +31,7 @@
 #include "net/partyhandler.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/widgets/tabstrip.cpp b/src/gui/widgets/tabstrip.cpp
index 2a8299ea1..6b3dbe417 100644
--- a/src/gui/widgets/tabstrip.cpp
+++ b/src/gui/widgets/tabstrip.cpp
@@ -22,6 +22,8 @@
 
 #include "gui/widgets/button.h"
 
+#include "utils/foreach.h"
+
 #include "debug.h"
 
 TabStrip::TabStrip(const Widget2 *const widget,
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index e15dc2481..714daae23 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -21,6 +21,8 @@
 
 #include "gui/widgets/vertcontainer.h"
 
+#include "utils/foreach.h"
+
 #include "debug.h"
 
 VertContainer::VertContainer(const Widget2 *const widget,
diff --git a/src/gui/widgets/widget.cpp b/src/gui/widgets/widget.cpp
index 260272936..8b49fddfd 100644
--- a/src/gui/widgets/widget.cpp
+++ b/src/gui/widgets/widget.cpp
@@ -73,6 +73,8 @@
 #include "listeners/widgetdeathlistener.h"
 #include "listeners/widgetlistener.h"
 
+#include "utils/foreach.h"
+
 #include "debug.h"
 
 Font* Widget::mGlobalFont = nullptr;
diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp
index 38efd1a77..e054e27ad 100644
--- a/src/gui/widgets/windowcontainer.cpp
+++ b/src/gui/widgets/windowcontainer.cpp
@@ -25,6 +25,7 @@
 #include "gui/widgets/window.h"
 
 #include "utils/dtor.h"
+#include "utils/foreach.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 41640a458..73a40531a 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -39,6 +39,7 @@
 #include "gui/widgets/button.h"
 
 #include "utils/dtor.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index edac6293d..b2249f66c 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -59,6 +59,7 @@
 #include "resources/db/unitsdb.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 
 #include <algorithm>
 
diff --git a/src/gui/windows/buyselldialog.cpp b/src/gui/windows/buyselldialog.cpp
index 009a24839..26cf2af17 100644
--- a/src/gui/windows/buyselldialog.cpp
+++ b/src/gui/windows/buyselldialog.cpp
@@ -31,6 +31,7 @@
 
 #include "gui/widgets/button.h"
 
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index cd801f61d..00fafdf1f 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -48,6 +48,8 @@
 #include "net/net.h"
 #include "net/serverfeatures.h"
 
+#include "utils/foreach.h"
+
 #include "resources/db/unitsdb.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 80c24af0a..eea0905cf 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -75,6 +75,7 @@
 
 #include "utils/copynpaste.h"
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 
 #include "utils/translation/podict.h"
 
diff --git a/src/gui/windows/editdialog.cpp b/src/gui/windows/editdialog.cpp
index be62c13b5..e14b96191 100644
--- a/src/gui/windows/editdialog.cpp
+++ b/src/gui/windows/editdialog.cpp
@@ -24,6 +24,7 @@
 
 #include "gui/widgets/button.h"
 
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp
index 0125177b1..981fb0b11 100644
--- a/src/gui/windows/emotewindow.cpp
+++ b/src/gui/windows/emotewindow.cpp
@@ -32,6 +32,7 @@
 #include "gui/widgets/tabbedarea.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index d77302035..1a95f4eee 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -48,6 +48,7 @@
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
 #include "utils/dtor.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "net/inventoryhandler.h"
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index ce121a98f..cd6e37941 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -41,6 +41,7 @@
 
 #include "input/inputmanager.h"
 
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 #include "utils/process.h"
 
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 869fede55..95d606618 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -52,6 +52,7 @@
 #include "resources/loaders/imageloader.h"
 
 #include "utils/gettext.h"
+#include "utils/foreach.h"
 #include "utils/sdlcheckutils.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index b3e63c226..312dd488a 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -47,6 +47,7 @@
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index 615c23d64..af9f19369 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -46,6 +46,7 @@
 #include "gui/widgets/staticbrowserbox.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "resources/questeffect.h"
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index ee5300d7d..6093b67b4 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -46,6 +46,7 @@
 #include "gui/widgets/scrollarea.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/langs.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/serverinfowindow.cpp b/src/gui/windows/serverinfowindow.cpp
index dcede8063..d1eb8cb44 100644
--- a/src/gui/windows/serverinfowindow.cpp
+++ b/src/gui/windows/serverinfowindow.cpp
@@ -28,6 +28,7 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/staticbrowserbox.h"
 
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 #include "utils/process.h"
 
diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp
index bf5272d24..40354f62a 100644
--- a/src/gui/windows/setupwindow.cpp
+++ b/src/gui/windows/setupwindow.cpp
@@ -55,6 +55,7 @@
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 54656a66b..9ff15b024 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -77,6 +77,7 @@
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #ifdef TMWA_SUPPORT
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index ffac3d320..61a7e6b45 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -36,6 +36,7 @@
 #include "gui/widgets/tabs/shortcuttab.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 3ec369b93..9fe112f78 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -55,6 +55,7 @@
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 86045c62d..db7d48c36 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -50,6 +50,7 @@
 #include "resources/db/moddb.h"
 
 #include "utils/delete2.h"
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 
 #include <sys/stat.h>
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index 697e3a0d5..3f253abc2 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -55,6 +55,7 @@
 #include "net/playerhandler.h"
 #include "net/serverfeatures.h"
 
+#include "utils/foreach.h"
 #include "utils/gettext.h"
 #include "utils/sdlhelper.h"