From 311c175f3184103950c72bc5c775174597430b83 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 14 Jul 2017 01:31:22 +0300
Subject: Replace std::vector into macro STD_VECTOR.

In most case it equal to std::vector except debug modes.
Now it can be also mse::mstd::vector, but sadly this class not support
all required features.
---
 src/gui/focushandler.h                     |  2 +-
 src/gui/models/beingslistmodel.h           |  4 ++--
 src/gui/models/colormodel.h                |  2 +-
 src/gui/models/extendednamesmodel.cpp      |  2 +-
 src/gui/models/extendednamesmodel.h        |  4 ++--
 src/gui/models/playertablemodel.h          |  2 +-
 src/gui/models/serverslistmodel.h          |  2 +-
 src/gui/models/shopitems.cpp               | 14 ++++++------
 src/gui/models/shopitems.h                 | 10 ++++-----
 src/gui/models/tablemodel.h                |  4 ++--
 src/gui/models/touchactionmodel.cpp        |  4 ++--
 src/gui/models/touchactionmodel.h          |  2 +-
 src/gui/models/updatelistmodel.h           |  2 +-
 src/gui/palette.h                          |  4 ++--
 src/gui/popups/beingpopup.cpp              |  6 +++---
 src/gui/popups/beingpopup.h                |  2 +-
 src/gui/popups/itempopup.cpp               |  4 ++--
 src/gui/popups/popupmenu.cpp               | 22 +++++++++----------
 src/gui/popups/popupmenu.h                 |  2 +-
 src/gui/shortcut/spellshortcut.cpp         |  4 ++--
 src/gui/theme.h                            |  2 +-
 src/gui/viewport.cpp                       |  2 +-
 src/gui/widgets/basiccontainer.h           |  2 +-
 src/gui/widgets/browserbox.h               |  4 ++--
 src/gui/widgets/characterviewnormal.cpp    |  6 +++---
 src/gui/widgets/characterviewnormal.h      |  4 ++--
 src/gui/widgets/characterviewsmall.cpp     |  8 +++----
 src/gui/widgets/characterviewsmall.h       |  4 ++--
 src/gui/widgets/emotepage.cpp              |  8 +++----
 src/gui/widgets/emoteshortcutcontainer.h   |  2 +-
 src/gui/widgets/equipmentpage.h            |  2 +-
 src/gui/widgets/extendedlistbox.cpp        |  2 +-
 src/gui/widgets/extendedlistbox.h          |  4 ++--
 src/gui/widgets/guitable.h                 |  2 +-
 src/gui/widgets/itemcontainer.cpp          |  4 ++--
 src/gui/widgets/itemlinkhandler.cpp        |  2 +-
 src/gui/widgets/itemshortcutcontainer.cpp  |  2 +-
 src/gui/widgets/layoutarray.cpp            | 24 ++++++++++-----------
 src/gui/widgets/layoutarray.h              |  6 +++---
 src/gui/widgets/layoutcell.cpp             |  6 +++---
 src/gui/widgets/setupitem.h                |  2 +-
 src/gui/widgets/staticbrowserbox.h         |  4 ++--
 src/gui/widgets/statspage.cpp              |  4 ++--
 src/gui/widgets/statspagebasic.cpp         |  4 ++--
 src/gui/widgets/tabbedarea.cpp             |  2 +-
 src/gui/widgets/tabbedarea.h               |  4 ++--
 src/gui/widgets/tabs/socialfriendstab.h    |  4 ++--
 src/gui/widgets/tabs/socialnavigationtab.h | 30 +++++++++++++-------------
 src/gui/widgets/tabs/socialplayerstab.h    | 10 ++++-----
 src/gui/widgets/tabs/socialtabbase.h       |  4 ++--
 src/gui/widgets/textbox.h                  |  2 +-
 src/gui/widgets/vertcontainer.cpp          |  2 +-
 src/gui/widgets/vertcontainer.h            |  2 +-
 src/gui/widgets/windowcontainer.h          |  2 +-
 src/gui/windowmenu.cpp                     |  8 +++----
 src/gui/windowmenu.h                       |  8 +++----
 src/gui/windows/buydialog.cpp              |  8 +++----
 src/gui/windows/charcreatedialog.cpp       |  6 +++---
 src/gui/windows/charcreatedialog.h         |  6 +++---
 src/gui/windows/charselectdialog.cpp       |  2 +-
 src/gui/windows/charselectdialog.h         |  2 +-
 src/gui/windows/emotewindow.cpp            |  2 +-
 src/gui/windows/equipmentwindow.cpp        | 34 +++++++++++++++---------------
 src/gui/windows/equipmentwindow.h          |  2 +-
 src/gui/windows/mailwindow.cpp             |  8 +++----
 src/gui/windows/mailwindow.h               |  2 +-
 src/gui/windows/ministatuswindow.cpp       |  2 +-
 src/gui/windows/ministatuswindow.h         |  6 +++---
 src/gui/windows/npcdialog.cpp              | 10 ++++-----
 src/gui/windows/npcdialog.h                |  4 ++--
 src/gui/windows/outfitwindow.cpp           |  6 +++---
 src/gui/windows/questswindow.cpp           | 26 +++++++++++------------
 src/gui/windows/questswindow.h             |  8 +++----
 src/gui/windows/quitdialog.cpp             |  4 ++--
 src/gui/windows/quitdialog.h               |  2 +-
 src/gui/windows/serverdialog.cpp           |  2 +-
 src/gui/windows/serverinfowindow.cpp       |  4 ++--
 src/gui/windows/serverinfowindow.h         |  2 +-
 src/gui/windows/setupwindow.cpp            |  2 +-
 src/gui/windows/setupwindow.h              |  2 +-
 src/gui/windows/shopwindow.cpp             | 28 ++++++++++++------------
 src/gui/windows/shortcutwindow.cpp         |  2 +-
 src/gui/windows/shortcutwindow.h           |  2 +-
 src/gui/windows/skilldialog.cpp            |  6 +++---
 src/gui/windows/skilldialog.h              |  2 +-
 src/gui/windows/statuswindow.cpp           |  4 ++--
 src/gui/windows/statuswindow.h             |  2 +-
 src/gui/windows/updaterwindow.cpp          | 26 +++++++++++------------
 src/gui/windows/updaterwindow.h            |  6 +++---
 src/gui/windows/whoisonline.cpp            | 12 +++++------
 src/gui/windows/whoisonline.h              | 10 ++++-----
 91 files changed, 269 insertions(+), 269 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index 346abc7b8..248ae8f71 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -345,7 +345,7 @@ class FocusHandler final
         /**
          * Typedef.
          */
-        typedef std::vector<Widget*> WidgetVector;
+        typedef STD_VECTOR<Widget*> WidgetVector;
 
         /**
          * Typedef.
diff --git a/src/gui/models/beingslistmodel.h b/src/gui/models/beingslistmodel.h
index db17f4833..a0a9d2920 100644
--- a/src/gui/models/beingslistmodel.h
+++ b/src/gui/models/beingslistmodel.h
@@ -45,7 +45,7 @@ class BeingsListModel final : public AvatarListModel
             mMembers.clear();
         }
 
-        std::vector<Avatar*> *getMembers() RETURNS_NONNULL A_WARN_UNUSED
+        STD_VECTOR<Avatar*> *getMembers() RETURNS_NONNULL A_WARN_UNUSED
         {
             return &mMembers;
         }
@@ -60,7 +60,7 @@ class BeingsListModel final : public AvatarListModel
             return CAST_S32(mMembers.size());
         }
 
-        std::vector<Avatar*> mMembers;
+        STD_VECTOR<Avatar*> mMembers;
 };
 
 #endif  // GUI_MODELS_BEINGSLISTMODEL_H
diff --git a/src/gui/models/colormodel.h b/src/gui/models/colormodel.h
index 225bc6536..9d621dfbe 100644
--- a/src/gui/models/colormodel.h
+++ b/src/gui/models/colormodel.h
@@ -63,7 +63,7 @@ class ColorModel final : public ListModel
 
     protected:
         StringVect mNames;
-        std::vector<ColorPair> mColors;
+        STD_VECTOR<ColorPair> mColors;
 };
 
 #endif  // GUI_MODELS_COLORMODEL_H
diff --git a/src/gui/models/extendednamesmodel.cpp b/src/gui/models/extendednamesmodel.cpp
index 146473a91..76191ae5a 100644
--- a/src/gui/models/extendednamesmodel.cpp
+++ b/src/gui/models/extendednamesmodel.cpp
@@ -59,7 +59,7 @@ const Image *ExtendedNamesModel::getImageAt(int i)
 void ExtendedNamesModel::clear()
 {
     mNames.clear();
-    FOR_EACH (std::vector<Image*>::iterator, it, mImages)
+    FOR_EACH (STD_VECTOR<Image*>::iterator, it, mImages)
     {
         if (*it != nullptr)
             (*it)->decRef();
diff --git a/src/gui/models/extendednamesmodel.h b/src/gui/models/extendednamesmodel.h
index cf1d13f6e..2e85a4b2b 100644
--- a/src/gui/models/extendednamesmodel.h
+++ b/src/gui/models/extendednamesmodel.h
@@ -43,7 +43,7 @@ class ExtendedNamesModel notfinal : public ExtendedListModel
         StringVect &getNames() A_WARN_UNUSED
         { return mNames; }
 
-        std::vector<Image*> &getImages() A_WARN_UNUSED
+        STD_VECTOR<Image*> &getImages() A_WARN_UNUSED
         { return mImages; }
 
         size_t size() A_WARN_UNUSED
@@ -56,7 +56,7 @@ class ExtendedNamesModel notfinal : public ExtendedListModel
 
     protected:
         StringVect mNames;
-        std::vector<Image*> mImages;
+        STD_VECTOR<Image*> mImages;
 };
 
 #endif  // GUI_MODELS_EXTENDEDNAMESMODEL_H
diff --git a/src/gui/models/playertablemodel.h b/src/gui/models/playertablemodel.h
index 4c8792bc7..dfb00eeb4 100644
--- a/src/gui/models/playertablemodel.h
+++ b/src/gui/models/playertablemodel.h
@@ -61,7 +61,7 @@ class PlayerTableModel final : public Widget2,
 
     protected:
         StringVect *mPlayers;
-        std::vector<Widget *> mWidgets;
+        STD_VECTOR<Widget *> mWidgets;
         PlayerRelationListModel *mListModel;
 };
 
diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h
index 206daa02a..8e236ebe0 100644
--- a/src/gui/models/serverslistmodel.h
+++ b/src/gui/models/serverslistmodel.h
@@ -109,7 +109,7 @@ class ServersListModel final : public ListModel
         }
 
     private:
-        typedef std::vector<VersionString> VersionStrings;
+        typedef STD_VECTOR<VersionString> VersionStrings;
 
         ServerInfos *mServers;
         VersionStrings mVersionStrings;
diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp
index 763b75390..27e05ff12 100644
--- a/src/gui/models/shopitems.cpp
+++ b/src/gui/models/shopitems.cpp
@@ -133,10 +133,10 @@ ShopItem *ShopItems::at(const size_t i) const
     return mShopItems.at(i);
 }
 
-bool ShopItems::findInAllItems(std::vector<ShopItem*>::iterator &it,
+bool ShopItems::findInAllItems(STD_VECTOR<ShopItem*>::iterator &it,
                                const ShopItem *const item)
 {
-    const std::vector<ShopItem*>::iterator it_end = mAllShopItems.end();
+    const STD_VECTOR<ShopItem*>::iterator it_end = mAllShopItems.end();
     for (it = mAllShopItems.begin(); it != it_end; ++ it)
     {
         if (*it == item)
@@ -151,7 +151,7 @@ void ShopItems::erase(const unsigned int i)
         return;
 
     const ShopItem *const item = *(mShopItems.begin() + i);
-    std::vector<ShopItem*>::iterator it;
+    STD_VECTOR<ShopItem*>::iterator it;
     if (findInAllItems(it, item))
         mAllShopItems.erase(it);
     mShopItems.erase(mShopItems.begin() + i);
@@ -163,7 +163,7 @@ void ShopItems::del(const unsigned int i)
         return;
 
     ShopItem *item = *(mShopItems.begin() + i);
-    std::vector<ShopItem*>::iterator it;
+    STD_VECTOR<ShopItem*>::iterator it;
     if (findInAllItems(it, item))
         mAllShopItems.erase(it);
     mShopItems.erase(mShopItems.begin() + i);
@@ -180,8 +180,8 @@ void ShopItems::clear()
 ShopItem *ShopItems::findItem(const int id,
                               const ItemColor color) const
 {
-    std::vector<ShopItem*>::const_iterator it = mShopItems.begin();
-    const std::vector<ShopItem*>::const_iterator e = mShopItems.end();
+    STD_VECTOR<ShopItem*>::const_iterator it = mShopItems.begin();
+    const STD_VECTOR<ShopItem*>::const_iterator e = mShopItems.end();
     while (it != e)
     {
         ShopItem *const item = *it;
@@ -197,7 +197,7 @@ ShopItem *ShopItems::findItem(const int id,
 void ShopItems::updateList()
 {
     mShopItems.clear();
-    FOR_EACH (std::vector<ShopItem*>::iterator, it, mAllShopItems)
+    FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, mAllShopItems)
     {
         ShopItem *const item = *it;
         if ((item != nullptr) && item->isVisible())
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index 8bb6719d7..26c5a94e4 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -132,10 +132,10 @@ class ShopItems final : public ListModel
          */
         void clear();
 
-        std::vector<ShopItem*> &items() A_WARN_UNUSED
+        STD_VECTOR<ShopItem*> &items() A_WARN_UNUSED
         { return mShopItems; }
 
-        std::vector<ShopItem*> &allItems() A_WARN_UNUSED
+        STD_VECTOR<ShopItem*> &allItems() A_WARN_UNUSED
         { return mAllShopItems; }
 
         void setMergeDuplicates(const bool b)
@@ -153,13 +153,13 @@ class ShopItems final : public ListModel
         ShopItem *findItem(const int id,
                            const ItemColor color) const A_WARN_UNUSED;
 
-        bool findInAllItems(std::vector<ShopItem*>::iterator &it,
+        bool findInAllItems(STD_VECTOR<ShopItem*>::iterator &it,
                             const ShopItem *const item);
 
         /** The list of items in the shop. */
-        std::vector<ShopItem*> mAllShopItems;
+        STD_VECTOR<ShopItem*> mAllShopItems;
 
-        std::vector<ShopItem*> mShopItems;
+        STD_VECTOR<ShopItem*> mShopItems;
 
         std::string mCurrency;
 
diff --git a/src/gui/models/tablemodel.h b/src/gui/models/tablemodel.h
index f28a60a6f..23f286c2e 100644
--- a/src/gui/models/tablemodel.h
+++ b/src/gui/models/tablemodel.h
@@ -146,8 +146,8 @@ class StaticTableModel final : public TableModel
         int mRows;
         int mColumns;
         int mHeight;
-        std::vector<Widget *> mTableModel;
-        std::vector<int> mWidths;
+        STD_VECTOR<Widget *> mTableModel;
+        STD_VECTOR<int> mWidths;
 };
 
 #endif  // GUI_MODELS_TABLEMODEL_H
diff --git a/src/gui/models/touchactionmodel.cpp b/src/gui/models/touchactionmodel.cpp
index 7f6b68ef7..1998d2752 100644
--- a/src/gui/models/touchactionmodel.cpp
+++ b/src/gui/models/touchactionmodel.cpp
@@ -50,7 +50,7 @@ TouchActionsModel::TouchActionsModel() :
     mActionId(),
     mActionToSelection()
 {
-    std::vector<SetupActionData*> data;
+    STD_VECTOR<SetupActionData*> data;
 
     for (int f = 0, fsz = touchActionDataSize; f < fsz; f ++)
     {
@@ -64,7 +64,7 @@ TouchActionsModel::TouchActionsModel() :
 
     std::sort(data.begin(), data.end(), touchActionSorter);
     int cnt = 0;
-    FOR_EACH (std::vector<SetupActionData*>::iterator, it, data)
+    FOR_EACH (STD_VECTOR<SetupActionData*>::iterator, it, data)
     {
         const SetupActionData *const data1 = *it;
         mNames.push_back(data1->name);
diff --git a/src/gui/models/touchactionmodel.h b/src/gui/models/touchactionmodel.h
index a3ea05c9d..2d8cff02a 100644
--- a/src/gui/models/touchactionmodel.h
+++ b/src/gui/models/touchactionmodel.h
@@ -42,7 +42,7 @@ class TouchActionsModel final : public NamesModel
         int getSelectionFromAction(const InputActionT action) const;
 
     private:
-        std::vector<InputActionT> mActionId;
+        STD_VECTOR<InputActionT> mActionId;
         std::map<InputActionT, int> mActionToSelection;
 };
 
diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h
index f50072112..cd4ba50c3 100644
--- a/src/gui/models/updatelistmodel.h
+++ b/src/gui/models/updatelistmodel.h
@@ -40,7 +40,7 @@ class UpdateListModel final : public ListModel
             mNames(),
             mServer(server)
         {
-            FOR_EACH(std::vector<HostsGroup>::const_iterator,
+            FOR_EACH(STD_VECTOR<HostsGroup>::const_iterator,
                      it,
                      server->updateHosts)
             {
diff --git a/src/gui/palette.h b/src/gui/palette.h
index f75f3f8fb..048dacf54 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -148,11 +148,11 @@ class Palette notfinal
                         committedColor.b;
             }
         };
-        typedef std::vector<ColorElem> Colors;
+        typedef STD_VECTOR<ColorElem> Colors;
         typedef std::map<unsigned char, int> CharColors;
         Colors mColors;
         CharColors mCharColors;
-        std::vector<ColorElem*> mGradVector;
+        STD_VECTOR<ColorElem*> mGradVector;
 };
 
 #endif  // GUI_PALETTE_H
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp
index 251848ed8..299683f6d 100644
--- a/src/gui/popups/beingpopup.cpp
+++ b/src/gui/popups/beingpopup.cpp
@@ -67,7 +67,7 @@ void BeingPopup::postInit()
 {
     Popup::postInit();
     add(mBeingName);
-    FOR_EACH (std::vector<Label*>::iterator, it, mLabels)
+    FOR_EACH (STD_VECTOR<Label*>::iterator, it, mLabels)
     {
         add(*it);
     }
@@ -124,7 +124,7 @@ void BeingPopup::show(const int x, const int y, Being *const b)
     }
 
     mBeingName->adjustSize();
-    FOR_EACH (std::vector<Label*>::iterator, it, mLabels)
+    FOR_EACH (STD_VECTOR<Label*>::iterator, it, mLabels)
     {
         (*it)->setCaption(std::string());
     }
@@ -311,7 +311,7 @@ void BeingPopup::show(const int x, const int y, Being *const b)
     int minWidth = mBeingName->getWidth();
     const int height1 = getFont()->getHeight();
     int height = height1;
-    FOR_EACH (std::vector<Label*>::iterator, it, mLabels)
+    FOR_EACH (STD_VECTOR<Label*>::iterator, it, mLabels)
     {
         const Label *const label = *it;
         if (label != nullptr)
diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h
index 8c218da2a..a14f44568 100644
--- a/src/gui/popups/beingpopup.h
+++ b/src/gui/popups/beingpopup.h
@@ -60,7 +60,7 @@ class BeingPopup final : public Popup
         void addLabels(const int fontHeight);
 
         Label *mBeingName A_NONNULLPOINTER;
-        std::vector<Label*> mLabels;
+        STD_VECTOR<Label*> mLabels;
 };
 
 extern BeingPopup *beingPopup;
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 5179627e1..eedead83d 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -382,12 +382,12 @@ std::string ItemPopup::getOptionsString(const ItemOptionsList *const options)
         const ItemOption &option = options->get(f);
         if (option.index == 0)
             continue;
-        const std::vector<ItemFieldType*> &fields = ItemOptionDb::getFields(
+        const STD_VECTOR<ItemFieldType*> &fields = ItemOptionDb::getFields(
             option.index);
         if (fields.empty())
             continue;
         const std::string valueStr = toString(option.value);
-        FOR_EACH (std::vector<ItemFieldType*>::const_iterator, it, fields)
+        FOR_EACH (STD_VECTOR<ItemFieldType*>::const_iterator, it, fields)
         {
             const ItemFieldType *const field = *it;
             std::string value = valueStr;
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 2f2df70c3..8b11b0c2f 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -460,8 +460,8 @@ bool PopupMenu::addBeingMenu()
     if (info == nullptr)
         return false;
 
-    const std::vector<BeingMenuItem> &menu = info->getMenu();
-    FOR_EACH (std::vector<BeingMenuItem>::const_iterator, it, menu)
+    const STD_VECTOR<BeingMenuItem> &menu = info->getMenu();
+    FOR_EACH (STD_VECTOR<BeingMenuItem>::const_iterator, it, menu)
     {
         const BeingMenuItem &item = *it;
         mBrowserBox->addRow("/" + item.command, item.name.c_str());
@@ -499,14 +499,14 @@ void PopupMenu::setMousePos2()
 }
 
 void PopupMenu::showPopup(const int x, const int y,
-                          const std::vector<ActorSprite*> &beings)
+                          const STD_VECTOR<ActorSprite*> &beings)
 {
     mX = x;
     mY = y;
     mBrowserBox->clearRows();
     // TRANSLATORS: popup menu header
     mBrowserBox->addRow(_("Players"));
-    FOR_EACH (std::vector<ActorSprite*>::const_iterator, it, beings)
+    FOR_EACH (STD_VECTOR<ActorSprite*>::const_iterator, it, beings)
     {
         const Being *const being = dynamic_cast<const Being*>(*it);
         const ActorSprite *const actor = *it;
@@ -1806,8 +1806,8 @@ void PopupMenu::showPopup(const int x, const int y, Button *const button)
     mY = y;
 
     mBrowserBox->clearRows();
-    std::vector<Button *> names = windowMenu->getButtons();
-    for (std::vector<Button *>::const_iterator it = names.begin(),
+    STD_VECTOR<Button *> names = windowMenu->getButtons();
+    for (STD_VECTOR<Button *>::const_iterator it = names.begin(),
          it_end = names.end(); it != it_end; ++ it)
     {
         const Button *const btn = *it;
@@ -1848,12 +1848,12 @@ void PopupMenu::showPopup(const int x, const int y, const ProgressBar *const b)
     mY = y;
 
     mBrowserBox->clearRows();
-    std::vector <ProgressBar*> bars = miniStatusWindow->getBars();
+    STD_VECTOR <ProgressBar*> bars = miniStatusWindow->getBars();
     ProgressBar *onlyBar = nullptr;
     int cnt = 0;
 
     // search for alone visible bar
-    for (std::vector <ProgressBar*>::const_iterator it = bars.begin(),
+    for (STD_VECTOR <ProgressBar*>::const_iterator it = bars.begin(),
          it_end = bars.end(); it != it_end; ++it)
     {
         ProgressBar *const bar = *it;
@@ -1869,7 +1869,7 @@ void PopupMenu::showPopup(const int x, const int y, const ProgressBar *const b)
     if (cnt > 1)
         onlyBar = nullptr;
 
-    for (std::vector <ProgressBar*>::const_iterator it = bars.begin(),
+    for (STD_VECTOR <ProgressBar*>::const_iterator it = bars.begin(),
          it_end = bars.end(); it != it_end; ++it)
     {
         ProgressBar *const bar = *it;
@@ -2107,11 +2107,11 @@ void PopupMenu::showWindowsPopup()
 {
     setMousePos();
     mBrowserBox->clearRows();
-    const std::vector<ButtonText*> &names = windowMenu->getButtonTexts();
+    const STD_VECTOR<ButtonText*> &names = windowMenu->getButtonTexts();
     // TRANSLATORS: popup menu header
     mBrowserBox->addRow(_("Show window"));
 
-    FOR_EACH (std::vector<ButtonText*>::const_iterator, it, names)
+    FOR_EACH (STD_VECTOR<ButtonText*>::const_iterator, it, names)
     {
         const ButtonText *const btn = *it;
         if (btn == nullptr)
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 8c090d1f9..9816afb93 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -83,7 +83,7 @@ class PopupMenu final : public Popup, public LinkHandler
          * Shows the beings related popup menu at the specified mouse coords.
          */
         void showPopup(const int x, const int y,
-                       const std::vector<ActorSprite*> &beings);
+                       const STD_VECTOR<ActorSprite*> &beings);
 
         void showPlayerPopup(const std::string &nick);
 
diff --git a/src/gui/shortcut/spellshortcut.cpp b/src/gui/shortcut/spellshortcut.cpp
index ef6815a2c..14eaa2f48 100644
--- a/src/gui/shortcut/spellshortcut.cpp
+++ b/src/gui/shortcut/spellshortcut.cpp
@@ -47,10 +47,10 @@ void SpellShortcut::load()
     if (spellManager == nullptr)
         return;
 
-    const std::vector<TextCommand*> &spells = spellManager->getAll();
+    const STD_VECTOR<TextCommand*> &spells = spellManager->getAll();
     unsigned k = 0;
 
-    for (std::vector<TextCommand*>::const_iterator i = spells.begin(),
+    for (STD_VECTOR<TextCommand*>::const_iterator i = spells.begin(),
          i_end = spells.end(); i != i_end && k < SPELLS_SIZE; ++i)
     {
         mItems[k++] = (*i)->getId();
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 9ef477452..8618468d9 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -200,7 +200,7 @@ class Theme final : public Palette,
          */
         float mMinimumOpacity;
 
-        typedef std::vector<DyePalette*> ProgressColors;
+        typedef STD_VECTOR<DyePalette*> ProgressColors;
         ProgressColors mProgressColors;
 };
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 1e9035cee..08d2bfb91 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -389,7 +389,7 @@ bool Viewport::openContextMenu(const MouseEvent &event)
         validateSpeed();
         if (actorManager != nullptr)
         {
-            std::vector<ActorSprite*> beings;
+            STD_VECTOR<ActorSprite*> beings;
             const int x = mMouseX + mPixelViewX;
             const int y = mMouseY + mPixelViewY;
             actorManager->findBeingsByPixel(beings, x, y, AllPlayers_true);
diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h
index ba2681bdc..9ab658a76 100644
--- a/src/gui/widgets/basiccontainer.h
+++ b/src/gui/widgets/basiccontainer.h
@@ -180,7 +180,7 @@ class BasicContainer notfinal : public Widget,
         /**
           * Typedef.
           */
-        typedef std::vector<Widget *> WidgetList;
+        typedef STD_VECTOR<Widget *> WidgetList;
 
           /**
           * Typedef.
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 04cff5aff..45502ba5a 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -167,12 +167,12 @@ class BrowserBox final : public Widget,
         TextRows mTextRows;
         std::list<int> mTextRowLinksCount;
 
-        typedef std::vector<LinePart> LinePartList;
+        typedef STD_VECTOR<LinePart> LinePartList;
         typedef LinePartList::iterator LinePartIterator;
         typedef LinePartList::const_iterator LinePartCIter;
         LinePartList mLineParts;
 
-        typedef std::vector<BrowserLink> Links;
+        typedef STD_VECTOR<BrowserLink> Links;
         typedef Links::iterator LinkIterator;
         Links mLinks;
 
diff --git a/src/gui/widgets/characterviewnormal.cpp b/src/gui/widgets/characterviewnormal.cpp
index 35032c4c9..c52616b85 100644
--- a/src/gui/widgets/characterviewnormal.cpp
+++ b/src/gui/widgets/characterviewnormal.cpp
@@ -34,7 +34,7 @@ namespace
 }  // namespace
 
 CharacterViewNormal::CharacterViewNormal(CharSelectDialog *const widget,
-                                         std::vector<CharacterDisplay*>
+                                         STD_VECTOR<CharacterDisplay*>
                                          *const entries,
                                          const int padding) :
     CharacterViewBase(widget, padding),
@@ -44,8 +44,8 @@ CharacterViewNormal::CharacterViewNormal(CharSelectDialog *const widget,
     addKeyListener(widget);
     if (entries != nullptr)
     {
-        FOR_EACHP (std::vector<CharacterDisplay*>::iterator,
-                    it, entries)
+        FOR_EACHP (STD_VECTOR<CharacterDisplay*>::iterator,
+                   it, entries)
         {
             CharacterDisplay *const character = *it;
             add(character);
diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h
index 4a48a725b..344549092 100644
--- a/src/gui/widgets/characterviewnormal.h
+++ b/src/gui/widgets/characterviewnormal.h
@@ -29,7 +29,7 @@ class CharacterViewNormal final : public CharacterViewBase
 {
     public:
         CharacterViewNormal(CharSelectDialog *const widget,
-                            std::vector<CharacterDisplay*> *const entries,
+                            STD_VECTOR<CharacterDisplay*> *const entries,
                             const int padding);
 
         A_DELETE_COPY(CharacterViewNormal)
@@ -43,7 +43,7 @@ class CharacterViewNormal final : public CharacterViewBase
         void action(const ActionEvent &event A_UNUSED) override final A_CONST;
 
     private:
-        std::vector<CharacterDisplay*> *mCharacterEntries;
+        STD_VECTOR<CharacterDisplay*> *mCharacterEntries;
         int mRows;
 };
 
diff --git a/src/gui/widgets/characterviewsmall.cpp b/src/gui/widgets/characterviewsmall.cpp
index 81580f9e1..a2fbdc8d4 100644
--- a/src/gui/widgets/characterviewsmall.cpp
+++ b/src/gui/widgets/characterviewsmall.cpp
@@ -30,7 +30,7 @@
 #include "debug.h"
 
 CharacterViewSmall::CharacterViewSmall(CharSelectDialog *const widget,
-                                       std::vector<CharacterDisplay*>
+                                       STD_VECTOR<CharacterDisplay*>
                                        *const entries,
                                        const int padding) :
     CharacterViewBase(widget, padding),
@@ -43,7 +43,7 @@ CharacterViewSmall::CharacterViewSmall(CharSelectDialog *const widget,
     addKeyListener(widget);
     if (entries != nullptr)
     {
-        FOR_EACHP (std::vector<CharacterDisplay*>::iterator,
+        FOR_EACHP (STD_VECTOR<CharacterDisplay*>::iterator,
                    it, entries)
         {
             add(*it);
@@ -106,8 +106,8 @@ void CharacterViewSmall::resize()
     const int h = mDimension.height;
     const int x = (w - firtChar->getWidth()) / 2;
     const int y = (h - firtChar->getHeight()) / 2;
-    FOR_EACHP (std::vector<CharacterDisplay*>::iterator,
-                it, mCharacterEntries)
+    FOR_EACHP (STD_VECTOR<CharacterDisplay*>::iterator,
+               it, mCharacterEntries)
     {
         (*it)->setPosition(x, y);
     }
diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h
index a10978981..f363c608e 100644
--- a/src/gui/widgets/characterviewsmall.h
+++ b/src/gui/widgets/characterviewsmall.h
@@ -31,7 +31,7 @@ class CharacterViewSmall final : public CharacterViewBase
 {
     public:
         CharacterViewSmall(CharSelectDialog *const widget,
-                           std::vector<CharacterDisplay*> *const entries,
+                           STD_VECTOR<CharacterDisplay*> *const entries,
                            const int padding);
         A_DELETE_COPY(CharacterViewSmall)
 
@@ -48,7 +48,7 @@ class CharacterViewSmall final : public CharacterViewBase
         Button *mPrevious;
         Button *mNext;
         Label *mNumber;
-        std::vector<CharacterDisplay*> *mCharacterEntries;
+        STD_VECTOR<CharacterDisplay*> *mCharacterEntries;
 };
 
 #endif  // GUI_WIDGETS_CHARACTERVIEWSMALL_H
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index afd165219..27721a86c 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -72,7 +72,7 @@ void EmotePage::draw(Graphics *const graphics)
         if (mEmotes == nullptr)
             return;
 
-        const std::vector<Image*> &images = mEmotes->getImages();
+        const STD_VECTOR<Image*> &images = mEmotes->getImages();
 
         const unsigned int width = mDimension.width;
         unsigned int x = 0;
@@ -80,7 +80,7 @@ void EmotePage::draw(Graphics *const graphics)
 
         mRedraw = false;
         mVertexes->clear();
-        FOR_EACH (std::vector<Image*>::const_iterator, it, images)
+        FOR_EACH (STD_VECTOR<Image*>::const_iterator, it, images)
         {
             const Image *const image = *it;
             if (image != nullptr)
@@ -108,13 +108,13 @@ void EmotePage::safeDraw(Graphics *const graphics)
     if (mEmotes == nullptr)
         return;
 
-    const std::vector<Image*> &images = mEmotes->getImages();
+    const STD_VECTOR<Image*> &images = mEmotes->getImages();
 
     const unsigned int width = mDimension.width;
     unsigned int x = 0;
     unsigned int y = 0;
 
-    FOR_EACH (std::vector<Image*>::const_iterator, it, images)
+    FOR_EACH (STD_VECTOR<Image*>::const_iterator, it, images)
     {
         const Image *const image = *it;
         if (image != nullptr)
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 2916a0140..14895d7a0 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -83,7 +83,7 @@ class EmoteShortcutContainer final : public ShortcutContainer
                         restrict2 override final;
 
     private:
-        std::vector<const EmoteSprite*> mEmoteImg;
+        STD_VECTOR<const EmoteSprite*> mEmoteImg;
 
         bool mEmoteClicked;
         unsigned char mEmoteMoved;
diff --git a/src/gui/widgets/equipmentpage.h b/src/gui/widgets/equipmentpage.h
index 33cbbf13f..f868478fb 100644
--- a/src/gui/widgets/equipmentpage.h
+++ b/src/gui/widgets/equipmentpage.h
@@ -42,7 +42,7 @@ struct EquipmentPage final
 
     A_DELETE_COPY(EquipmentPage)
 
-    std::vector<EquipmentBox*> boxes;
+    STD_VECTOR<EquipmentBox*> boxes;
     int x;
     int y;
     int width;
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index ebbb07bf3..01967712c 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -84,7 +84,7 @@ void ExtendedListBox::draw(Graphics *const graphics)
         if (image != nullptr)
             strWidth += image->getWidth() + mImagePadding;
 
-        std::vector<ExtendedListBoxItem> &list =
+        STD_VECTOR<ExtendedListBoxItem> &list =
             row == mSelected ? mSelectedItems : mListItems;
 
         if (insideWidth < strWidth)
diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h
index 380cf76fa..6d97ee6d3 100644
--- a/src/gui/widgets/extendedlistbox.h
+++ b/src/gui/widgets/extendedlistbox.h
@@ -54,8 +54,8 @@ class ExtendedListBox final : public ListBox
         int mImagePadding;
         int mSpacing;
         int mHeight;
-        std::vector<ExtendedListBoxItem> mListItems;
-        std::vector<ExtendedListBoxItem> mSelectedItems;
+        STD_VECTOR<ExtendedListBoxItem> mListItems;
+        STD_VECTOR<ExtendedListBoxItem> mSelectedItems;
 };
 
 #endif  // GUI_WIDGETS_EXTENDEDLISTBOX_H
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index aa040f094..30eb73523 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -188,7 +188,7 @@ class GuiTable final : public Widget,
         Widget *mTopWidget;
 
         /** Vector for compactness; used as a list in practice. */
-        std::vector<GuiTableActionListener *> mActionListeners2;
+        STD_VECTOR<GuiTableActionListener *> mActionListeners2;
 
         /**
          * Holds the background color of the table.
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 7193ce0f1..f53af32a6 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -1093,7 +1093,7 @@ void ItemContainer::updateMatrix()
     delete []mShowMatrix;
     mShowMatrix = new int[CAST_SIZE(mGridRows * mGridColumns)];
 
-    std::vector<ItemIdPair*> sortedItems;
+    STD_VECTOR<ItemIdPair*> sortedItems;
     int i = 0;
     int j = 0;
 
@@ -1156,7 +1156,7 @@ void ItemContainer::updateMatrix()
 
     int jMult = j * mGridColumns;
     const int maxSize = mGridRows * mGridColumns;
-    FOR_EACH (std::vector<ItemIdPair*>::const_iterator, iter, sortedItems)
+    FOR_EACH (STD_VECTOR<ItemIdPair*>::const_iterator, iter, sortedItems)
     {
         if (jMult >= maxSize)
             break;
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 295e41d16..403573daf 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -138,7 +138,7 @@ void ItemLinkHandler::handleItemLink(const std::string &link)
     if (ch < '0' || ch > '9')
         return;
 
-    std::vector<int> str;
+    STD_VECTOR<int> str;
     splitToIntVector(str, link, ',');
     if (str.empty())
         return;
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 3990137e0..1f50637e4 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -606,7 +606,7 @@ void ItemShortcutContainer::mouseMoved(MouseEvent &event)
         int offsetY = 0;
         if (!data.empty())
         {
-            std::vector<int> vect;
+            STD_VECTOR<int> vect;
             splitToIntVector(vect, data, ' ');
             const size_t sz = vect.size();
             if (sz > 0)
diff --git a/src/gui/widgets/layoutarray.cpp b/src/gui/widgets/layoutarray.cpp
index de9c8cd30..6269d8b5b 100644
--- a/src/gui/widgets/layoutarray.cpp
+++ b/src/gui/widgets/layoutarray.cpp
@@ -39,14 +39,14 @@ LayoutArray::LayoutArray() :
 
 LayoutArray::~LayoutArray()
 {
-    std::vector <std::vector <LayoutCell *> >::iterator
+    STD_VECTOR <STD_VECTOR <LayoutCell *> >::iterator
         i = mCells.begin();
-    const std::vector <std::vector <LayoutCell *> >::iterator
+    const STD_VECTOR <STD_VECTOR <LayoutCell *> >::iterator
         i_end = mCells.end();
     while (i != i_end)
     {
-        std::vector< LayoutCell * >::iterator j = i->begin();
-        const std::vector< LayoutCell * >::iterator j_end = i->end();
+        STD_VECTOR< LayoutCell * >::iterator j = i->begin();
+        const STD_VECTOR< LayoutCell * >::iterator j_end = i->end();
         while (j != j_end)
         {
             delete *j;
@@ -85,9 +85,9 @@ void LayoutArray::resizeGrid(int w, const int h)
     if (extW)
         mSizes[0].resize(CAST_SIZE(w), LayoutType::DEF);
 
-    std::vector <std::vector <LayoutCell *> >::iterator
+    STD_VECTOR <STD_VECTOR <LayoutCell *> >::iterator
         i = mCells.begin();
-    const std::vector <std::vector <LayoutCell *> >::iterator
+    const STD_VECTOR <STD_VECTOR <LayoutCell *> >::iterator
         i_end = mCells.end();
     while (i != i_end)
     {
@@ -111,7 +111,7 @@ void LayoutArray::setRowHeight(const int n, const int h)
 void LayoutArray::matchColWidth(const int n1, const int n2)
 {
     resizeGrid(std::max(n1, n2) + 1, 0);
-    const std::vector<int> widths = getSizes(0, LayoutType::DEF);
+    const STD_VECTOR<int> widths = getSizes(0, LayoutType::DEF);
     const int s = std::max(widths[CAST_SIZE(n1)],
         widths[CAST_SIZE(n2)]);
     mSizes[0][CAST_SIZE(n1)] = s;
@@ -192,14 +192,14 @@ void LayoutArray::align(int &restrict pos, int &restrict size, const int dim,
     }
 }
 
-std::vector<int> LayoutArray::getSizes(const int dim, int upp) const
+STD_VECTOR<int> LayoutArray::getSizes(const int dim, int upp) const
 {
     if (dim < 0 || dim >= 2)
         return mSizes[1];
 
     const int gridW = CAST_S32(mSizes[0].size());
     const int gridH = CAST_S32(mSizes[1].size());
-    std::vector<int> sizes = mSizes[dim];
+    STD_VECTOR<int> sizes = mSizes[dim];
 
     // Compute minimum sizes.
     for (int gridY = 0; gridY < gridH; ++gridY)
@@ -266,7 +266,7 @@ std::vector<int> LayoutArray::getSizes(const int dim, int upp) const
 
 int LayoutArray::getSize(const int dim) const
 {
-    std::vector<int> sizes = getSizes(dim, LayoutType::DEF);
+    STD_VECTOR<int> sizes = getSizes(dim, LayoutType::DEF);
     int size = 0;
     const int nb = CAST_S32(sizes.size());
     for (int i = 0; i < nb; ++i)
@@ -284,8 +284,8 @@ void LayoutArray::reflow(const int nx, const int ny,
     const int gridW = CAST_S32(mSizes[0].size());
     const int gridH = CAST_S32(mSizes[1].size());
 
-    std::vector<int> widths  = getSizes(0, nw);
-    std::vector<int> heights = getSizes(1, nh);
+    STD_VECTOR<int> widths  = getSizes(0, nw);
+    STD_VECTOR<int> heights = getSizes(1, nh);
 
     const int szW = CAST_S32(widths.size());
     const int szH = CAST_S32(heights.size());
diff --git a/src/gui/widgets/layoutarray.h b/src/gui/widgets/layoutarray.h
index 2a35635dc..cca05e091 100644
--- a/src/gui/widgets/layoutarray.h
+++ b/src/gui/widgets/layoutarray.h
@@ -111,15 +111,15 @@ class LayoutArray final
          * Gets the column/row sizes along a given axis.
          * @param upp target size for the array. Ignored if AUTO_DEF.
          */
-        std::vector<int> getSizes(const int dim, int upp) const A_WARN_UNUSED;
+        STD_VECTOR<int> getSizes(const int dim, int upp) const A_WARN_UNUSED;
 
         /**
          * Gets the total size along a given axis.
          */
         int getSize(const int dim) const A_WARN_UNUSED;
 
-        std::vector<int> mSizes[2];
-        std::vector< std::vector < LayoutCell * > > mCells;
+        STD_VECTOR<int> mSizes[2];
+        STD_VECTOR< STD_VECTOR < LayoutCell * > > mCells;
 
         int mSpacing;
 };
diff --git a/src/gui/widgets/layoutcell.cpp b/src/gui/widgets/layoutcell.cpp
index b898b1dfc..7db5d0783 100644
--- a/src/gui/widgets/layoutcell.cpp
+++ b/src/gui/widgets/layoutcell.cpp
@@ -80,13 +80,13 @@ void LayoutCell::computeSizes()
     if (mType != ARRAY)
         return;
 
-    std::vector <std::vector <LayoutCell *> >::const_iterator
+    STD_VECTOR <STD_VECTOR <LayoutCell *> >::const_iterator
         i = mArray->mCells.begin();
-    const std::vector <std::vector <LayoutCell *> >::const_iterator
+    const STD_VECTOR <STD_VECTOR <LayoutCell *> >::const_iterator
         i_end = mArray->mCells.end();
     while (i != i_end)
     {
-        std::vector <LayoutCell *>::const_iterator j = i->begin();
+        STD_VECTOR <LayoutCell *>::const_iterator j = i->begin();
         while (j != i->end())
         {
             LayoutCell *const cell = *j;
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 4ad4ea3cf..a60c970c9 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -403,7 +403,7 @@ class SetupItemSlider final : public SetupItem
         OnTheFly mOnTheFly;
 };
 
-typedef std::vector<std::string> SetupItemNames;
+typedef STD_VECTOR<std::string> SetupItemNames;
 typedef SetupItemNames::iterator SetupItemNamesIter;
 typedef SetupItemNames::const_iterator SetupItemNamesConstIter;
 
diff --git a/src/gui/widgets/staticbrowserbox.h b/src/gui/widgets/staticbrowserbox.h
index 7698ec5ff..93d05049f 100644
--- a/src/gui/widgets/staticbrowserbox.h
+++ b/src/gui/widgets/staticbrowserbox.h
@@ -152,12 +152,12 @@ class StaticBrowserBox final : public Widget,
         TextRows mTextRows;
         std::list<int> mTextRowLinksCount;
 
-        typedef std::vector<LinePart> LinePartList;
+        typedef STD_VECTOR<LinePart> LinePartList;
         typedef LinePartList::iterator LinePartIterator;
         typedef LinePartList::const_iterator LinePartCIter;
         LinePartList mLineParts;
 
-        typedef std::vector<BrowserLink> Links;
+        typedef STD_VECTOR<BrowserLink> Links;
         typedef Links::iterator LinkIterator;
         Links mLinks;
 
diff --git a/src/gui/widgets/statspage.cpp b/src/gui/widgets/statspage.cpp
index 65d322c05..5fa58f2e5 100644
--- a/src/gui/widgets/statspage.cpp
+++ b/src/gui/widgets/statspage.cpp
@@ -50,8 +50,8 @@ StatsPage::StatsPage(const Widget2 *const widget,
     mAttrCont->setSelectable(false);
 
     add(mAttrScroll);
-    const std::vector<BasicStat> &basicStats = StatDb::getStats(page);
-    FOR_EACH (std::vector<BasicStat>::const_iterator, it, basicStats)
+    const STD_VECTOR<BasicStat> &basicStats = StatDb::getStats(page);
+    FOR_EACH (STD_VECTOR<BasicStat>::const_iterator, it, basicStats)
     {
         const BasicStat &stat = *it;
         AttrDisplay *disp = new DerDisplay(this,
diff --git a/src/gui/widgets/statspagebasic.cpp b/src/gui/widgets/statspagebasic.cpp
index 2996e5f12..ec00026d4 100644
--- a/src/gui/widgets/statspagebasic.cpp
+++ b/src/gui/widgets/statspagebasic.cpp
@@ -54,8 +54,8 @@ StatsPageBasic::StatsPageBasic(const Widget2 *const widget) :
     mAttrCont->setSelectable(false);
 
     add(mAttrScroll);
-    const std::vector<BasicStat> &basicStats = StatDb::getBasicStats();
-    FOR_EACH (std::vector<BasicStat>::const_iterator, it, basicStats)
+    const STD_VECTOR<BasicStat> &basicStats = StatDb::getBasicStats();
+    FOR_EACH (STD_VECTOR<BasicStat>::const_iterator, it, basicStats)
     {
         const BasicStat &stat = *it;
         AttrDisplay *disp = new ChangeDisplay(this,
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index f63772907..ced56cea0 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -337,7 +337,7 @@ void TabbedArea::removeTab(Tab *const tab)
         }
     }
 
-    for (std::vector<Tab*>::iterator iter2 = mTabsToDelete.begin();
+    for (STD_VECTOR<Tab*>::iterator iter2 = mTabsToDelete.begin();
          iter2 != mTabsToDelete.end(); ++iter2)
     {
         if (*iter2 == tab)
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 4e609970d..c971da391 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -244,7 +244,7 @@ class TabbedArea final : public ActionListener,
         { return mWidgetContainer; }
 
     private:
-        typedef std::vector <std::pair<Tab*, Widget*> > TabContainer;
+        typedef STD_VECTOR <std::pair<Tab*, Widget*> > TabContainer;
 
         /** The tab arrows */
         Button *mArrowButton[2] A_NONNULLPOINTER;
@@ -261,7 +261,7 @@ class TabbedArea final : public ActionListener,
         Tab* mSelectedTab;
         BasicContainer2* mTabContainer A_NONNULLPOINTER;
         BasicContainer2* mWidgetContainer A_NONNULLPOINTER;
-        std::vector<Tab*> mTabsToDelete;
+        STD_VECTOR<Tab*> mTabsToDelete;
         TabContainer mTabs;
 
         /**
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index 017f465c7..d1cd942cd 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -75,9 +75,9 @@ class SocialFriendsTab final : public SocialTab
             if (actorManager == nullptr)
                 return;
 
-            std::vector<Avatar*> *const avatars = mBeings->getMembers();
+            STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
 
-            std::vector<Avatar*>::iterator ia = avatars->begin();
+            STD_VECTOR<Avatar*>::iterator ia = avatars->begin();
             while (ia != avatars->end())
             {
                 delete *ia;
diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h
index 80b5910f3..3bd584991 100644
--- a/src/gui/widgets/tabs/socialnavigationtab.h
+++ b/src/gui/widgets/tabs/socialnavigationtab.h
@@ -82,13 +82,13 @@ class SocialNavigationTab final : public SocialTab
             if (socialWindow->getProcessedPortals())
                 return;
 
-            std::vector<Avatar*> *const avatars = mBeings->getMembers();
-            std::vector<MapItem*> portals = map->getPortals();
+            STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
+            STD_VECTOR<MapItem*> portals = map->getPortals();
 
-            std::vector<MapItem*>::const_iterator i = portals.begin();
+            STD_VECTOR<MapItem*>::const_iterator i = portals.begin();
             const SpecialLayer *const specialLayer = map->getSpecialLayer();
 
-            std::vector<Avatar*>::iterator ia = avatars->begin();
+            STD_VECTOR<Avatar*>::iterator ia = avatars->begin();
 
             while (ia != avatars->end())
             {
@@ -170,7 +170,7 @@ class SocialNavigationTab final : public SocialTab
             if (localPlayer == nullptr)
                 return;
 
-            std::vector<Avatar*> *const avatars = mBeings->getMembers();
+            STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
             if (avatars->size() <= CAST_SIZE(num))
                 return;
 
@@ -184,14 +184,14 @@ class SocialNavigationTab final : public SocialTab
             if (socialWindow == nullptr)
                 return;
 
-            std::vector<Avatar*> *const avatars = mBeings->getMembers();
+            STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
 
             const Map *const map = socialWindow->getMap();
             if (map == nullptr)
                 return;
 
-            std::vector<Avatar*>::const_iterator i = avatars->begin();
-            const std::vector<Avatar*>::const_iterator i_end = avatars->end();
+            STD_VECTOR<Avatar*>::const_iterator i = avatars->begin();
+            const STD_VECTOR<Avatar*>::const_iterator i_end = avatars->end();
             while (i != i_end)
             {
                 Avatar *const ava = *i;
@@ -218,13 +218,13 @@ class SocialNavigationTab final : public SocialTab
             if (socialWindow == nullptr)
                 return -1;
 
-            std::vector<Avatar*> *const avatars = mBeings->getMembers();
+            STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
             const Map *const map = socialWindow->getMap();
             if (map == nullptr)
                 return -1;
 
-            std::vector<Avatar*>::const_iterator i = avatars->begin();
-            const std::vector<Avatar*>::const_iterator i_end = avatars->end();
+            STD_VECTOR<Avatar*>::const_iterator i = avatars->begin();
+            const STD_VECTOR<Avatar*>::const_iterator i_end = avatars->end();
             unsigned num = 0;
             while (i != i_end)
             {
@@ -250,7 +250,7 @@ class SocialNavigationTab final : public SocialTab
             if (map == nullptr)
                 return;
 
-            std::vector<Avatar*> *const avatars = mBeings->getMembers();
+            STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
             const MapItem *const portal = map->findPortalXY(x, y);
             if (portal == nullptr)
                 return;
@@ -279,9 +279,9 @@ class SocialNavigationTab final : public SocialTab
             if (map == nullptr)
                 return;
 
-            std::vector<Avatar*> *const avatars = mBeings->getMembers();
-            std::vector<Avatar*>::iterator i = avatars->begin();
-            const std::vector<Avatar*>::iterator i_end = avatars->end();
+            STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
+            STD_VECTOR<Avatar*>::iterator i = avatars->begin();
+            const STD_VECTOR<Avatar*>::iterator i_end = avatars->end();
 
             while (i != i_end)
             {
diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h
index 87b0335c1..c43093fca 100644
--- a/src/gui/widgets/tabs/socialplayerstab.h
+++ b/src/gui/widgets/tabs/socialplayerstab.h
@@ -119,10 +119,10 @@ class SocialPlayersTab final : public SocialTab
 
         Avatar* findAvatarbyName(const std::string &name)
         {
-            std::vector<Avatar*> *const avatars = mBeings->getMembers();
+            STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
             Avatar *ava = nullptr;
-            std::vector<Avatar*>::const_iterator i = avatars->begin();
-            const std::vector<Avatar*>::const_iterator i_end = avatars->end();
+            STD_VECTOR<Avatar*>::const_iterator i = avatars->begin();
+            const STD_VECTOR<Avatar*>::const_iterator i_end = avatars->end();
             while (i != i_end)
             {
                 ava = (*i);
@@ -138,13 +138,13 @@ class SocialPlayersTab final : public SocialTab
 
         void getPlayersAvatars()
         {
-            std::vector<Avatar*> *const avatars = mBeings->getMembers();
+            STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();
             if (actorManager != nullptr)
             {
                 StringVect names;
                 actorManager->getPlayerNames(names, NpcNames_false);
 
-                std::vector<Avatar*>::iterator ai = avatars->begin();
+                STD_VECTOR<Avatar*>::iterator ai = avatars->begin();
                 while (ai != avatars->end())
                 {
                     bool finded = false;
diff --git a/src/gui/widgets/tabs/socialtabbase.h b/src/gui/widgets/tabs/socialtabbase.h
index 9cffcae89..03a02bb1f 100644
--- a/src/gui/widgets/tabs/socialtabbase.h
+++ b/src/gui/widgets/tabs/socialtabbase.h
@@ -68,8 +68,8 @@ ENUMS_RESOURCES_MAP_MAPITEMTYPE_H
 #define updateAtkListStart() \
     if (!socialWindow || !localPlayer || !actorManager)\
         return;\
-    std::vector<Avatar*> *const avatars = mBeings->getMembers();\
-    std::vector<Avatar*>::iterator ia = avatars->begin();\
+    STD_VECTOR<Avatar*> *const avatars = mBeings->getMembers();\
+    STD_VECTOR<Avatar*>::iterator ia = avatars->begin();\
     while (ia != avatars->end())\
     {\
         delete *ia;\
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index fefd862a0..6ce28ed4b 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -301,7 +301,7 @@ class TextBox final : public Widget,
         /**
          * Holds all the rows of the text.
          */
-        std::vector<std::string> mTextRows;
+        STD_VECTOR<std::string> mTextRows;
 
         /**
          * Holds the current column of the caret.
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index 714daae23..53e082501 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -84,6 +84,6 @@ void VertContainer::clear()
 
 void VertContainer::widgetResized(const Event &event A_UNUSED)
 {
-    FOR_EACH (std::vector<Widget*>::const_iterator, it, mResizableWidgets)
+    FOR_EACH (STD_VECTOR<Widget*>::const_iterator, it, mResizableWidgets)
         (*it)->setWidth(getWidth());
 }
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 41b3ed217..c0dd118cf 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -54,7 +54,7 @@ class VertContainer final : public Container,
         void widgetResized(const Event &event) override final;
 
     private:
-        std::vector<Widget*> mResizableWidgets;
+        STD_VECTOR<Widget*> mResizableWidgets;
         int mVerticalItemSize;
         int mCount;
         int mNextY;
diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h
index 5947994ab..98a62ac28 100644
--- a/src/gui/widgets/windowcontainer.h
+++ b/src/gui/widgets/windowcontainer.h
@@ -64,7 +64,7 @@ class WindowContainer notfinal : public Container
         /**
          * List of widgets that are scheduled to be deleted.
          */
-        typedef std::vector<Widget*> Widgets;
+        typedef STD_VECTOR<Widget*> Widgets;
         typedef Widgets::iterator WidgetIterator;
         Widgets mDeathList;
 };
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 73a40531a..477aa719d 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -222,7 +222,7 @@ WindowMenu::~WindowMenu()
         delete (*it).second;
     }
     mButtonNames.clear();
-    FOR_EACH (std::vector <Button*>::iterator, it, mButtons)
+    FOR_EACH (STD_VECTOR <Button*>::iterator, it, mButtons)
     {
         Button *const btn = *it;
         if (btn == nullptr)
@@ -362,10 +362,10 @@ void WindowMenu::updateButtons()
 {
     int x = mPadding;
     int h = 0;
-    FOR_EACH (std::vector <Button*>::const_iterator, it, mButtons)
+    FOR_EACH (STD_VECTOR <Button*>::const_iterator, it, mButtons)
         safeRemove(*it);
     const int pad2 = 2 * mPadding;
-    FOR_EACH (std::vector <Button*>::iterator, it, mButtons)
+    FOR_EACH (STD_VECTOR <Button*>::iterator, it, mButtons)
     {
         Button *const btn = *it;
         if (btn == nullptr)
@@ -439,7 +439,7 @@ void WindowMenu::loadButtons()
 void WindowMenu::saveButtons() const
 {
     int i = 0;
-    FOR_EACH (std::vector <Button*>::const_iterator, it, mButtons)
+    FOR_EACH (STD_VECTOR <Button*>::const_iterator, it, mButtons)
     {
         const Button *const btn = *it;
         if ((btn != nullptr) && btn->mVisible == Visible_false)
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 106c33e25..780fe29ea 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -68,10 +68,10 @@ class WindowMenu final : public Container,
         std::map <std::string, ButtonInfo*> &getButtonNames() A_WARN_UNUSED
         { return mButtonNames; }
 
-        std::vector <Button*> &getButtons() A_WARN_UNUSED
+        STD_VECTOR <Button*> &getButtons() A_WARN_UNUSED
         { return mButtons; }
 
-        std::vector <ButtonText*> &getButtonTexts() A_WARN_UNUSED
+        STD_VECTOR <ButtonText*> &getButtonTexts() A_WARN_UNUSED
         { return mButtonTexts; }
 
         void showButton(const std::string &name, const Visible visible);
@@ -105,8 +105,8 @@ class WindowMenu final : public Container,
         Skin *mSkin;
         int mPadding;
         int mSpacing;
-        std::vector <Button*> mButtons;
-        std::vector <ButtonText*> mButtonTexts;
+        STD_VECTOR <Button*> mButtons;
+        STD_VECTOR <ButtonText*> mButtonTexts;
         std::map <std::string, ButtonInfo*> mButtonNames;
         bool mHaveMouse;
         int mAutoHide;
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index b2249f66c..fe980dd33 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -462,7 +462,7 @@ void BuyDialog::sort()
 {
     if ((mSortDropDown != nullptr) && (mShopItems != nullptr))
     {
-        std::vector<ShopItem*> &items = mShopItems->items();
+        STD_VECTOR<ShopItem*> &items = mShopItems->items();
         switch (mSortDropDown->getSelected())
         {
             case 1:
@@ -646,7 +646,7 @@ void BuyDialog::action(const ActionEvent &event)
     }
     else if (eventId == "confirm")
     {
-        std::vector<ShopItem*> &items = mShopItems->allItems();
+        STD_VECTOR<ShopItem*> &items = mShopItems->allItems();
 
         if (mNpcId == fromInt(Market, BeingId))
         {
@@ -773,10 +773,10 @@ void BuyDialog::closeAll()
 
 void BuyDialog::applyNameFilter(const std::string &filter)
 {
-    std::vector<ShopItem*> &items = mShopItems->allItems();
+    STD_VECTOR<ShopItem*> &items = mShopItems->allItems();
     std::string filterStr = filter;
     toLower(filterStr);
-    FOR_EACH (std::vector<ShopItem*>::iterator, it, items)
+    FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, items)
     {
         ShopItem *const item = *it;
         if (item == nullptr)
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 4d4e7b35b..9037ac614 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -149,9 +149,9 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
     setContentSize(w, h);
 
     mPlayer->setGender(Gender::MALE);
-    const std::vector<BeingSlot> &items = CharDB::getDefaultItems();
+    const STD_VECTOR<BeingSlot> &items = CharDB::getDefaultItems();
     int i = 1;
-    for (std::vector<BeingSlot>::const_iterator it = items.begin(),
+    for (STD_VECTOR<BeingSlot>::const_iterator it = items.begin(),
          it_fend = items.end();
          it != it_fend;
          ++ it, i ++)
@@ -443,7 +443,7 @@ void CharCreateDialog::action(const ActionEvent &event)
             // Attempt to create the character
             mCreateButton->setEnabled(false);
 
-            std::vector<int> atts;
+            STD_VECTOR<int> atts;
             const size_t sz = mAttributeSlider.size();
             for (size_t i = 0; i < sz; i++)
             {
diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h
index 6775adc9f..5c4fdfcc3 100644
--- a/src/gui/windows/charcreatedialog.h
+++ b/src/gui/windows/charcreatedialog.h
@@ -127,9 +127,9 @@ class CharCreateDialog final : public Window,
         Button *mActionButton;
         Button *mRotateButton;
 
-        std::vector<Slider*> mAttributeSlider;
-        std::vector<Label*> mAttributeLabel;
-        std::vector<Label*> mAttributeValue;
+        STD_VECTOR<Slider*> mAttributeSlider;
+        STD_VECTOR<Label*> mAttributeLabel;
+        STD_VECTOR<Label*> mAttributeValue;
         Label *mAttributesLeft;
 
         Button *mCreateButton;
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 00fafdf1f..c44464de1 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -491,7 +491,7 @@ void CharSelectDialog::attemptCharacterSelect(const int index)
 void CharSelectDialog::setCharacters(const Net::Characters &characters)
 {
     // Reset previous characters
-    FOR_EACH (std::vector<CharacterDisplay*>::const_iterator,
+    FOR_EACH (STD_VECTOR<CharacterDisplay*>::const_iterator,
               iter, mCharacterEntries)
     {
         if (*iter != nullptr)
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index 23d0d22cd..9cf56bfd6 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -124,7 +124,7 @@ class CharSelectDialog final : public Window,
         Button *mRenameButton;
         CharacterViewBase *mCharacterView;
 
-        std::vector<CharacterDisplay*> mCharacterEntries;
+        STD_VECTOR<CharacterDisplay*> mCharacterEntries;
 
         Net::CharServerHandler *mCharServerHandler;
         TextDialog *mDeleteDialog;
diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp
index 981fb0b11..e82d9986f 100644
--- a/src/gui/windows/emotewindow.cpp
+++ b/src/gui/windows/emotewindow.cpp
@@ -169,7 +169,7 @@ void EmoteWindow::show()
     if (dictionary != nullptr)
     {
         mTextModel->clear();
-        const std::vector<std::string> &texts = TextDb::getTexts();
+        const STD_VECTOR<std::string> &texts = TextDb::getTexts();
         FOR_EACH (StringVectCIter, it, texts)
         {
             mTextModel->add(dictionary->getStr(*it));
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 1a95f4eee..a859ef02b 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -159,9 +159,9 @@ EquipmentWindow::~EquipmentWindow()
             delete mEquipment->getBackend();
         delete2(mEquipment)
     }
-    FOR_EACH (std::vector<EquipmentPage*>::iterator, it, mPages)
+    FOR_EACH (STD_VECTOR<EquipmentPage*>::iterator, it, mPages)
     {
-        std::vector<EquipmentBox*> &boxes = (*it)->boxes;
+        STD_VECTOR<EquipmentBox*> &boxes = (*it)->boxes;
         delete_all(boxes);
         boxes.clear();
         delete *it;
@@ -187,12 +187,12 @@ void EquipmentWindow::draw(Graphics *const graphics)
     int i = 0;
     Font *const font = getFont();
     const int fontHeight = font->getHeight();
-    const std::vector<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes;
+    const STD_VECTOR<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes;
 
     if (mLastRedraw)
     {
         mVertexes->clear();
-        FOR_EACH (std::vector<EquipmentBox*>::const_iterator, it, boxes)
+        FOR_EACH (STD_VECTOR<EquipmentBox*>::const_iterator, it, boxes)
         {
             const EquipmentBox *const box = *it;
             if (box == nullptr)
@@ -226,7 +226,7 @@ void EquipmentWindow::draw(Graphics *const graphics)
 
     i = 0;
     const int projSlot = inventoryHandler->getProjectileSlot();
-    for (std::vector<EquipmentBox*>::const_iterator it = boxes.begin(),
+    for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(),
          it_end = boxes.end(); it != it_end; ++ it, ++ i)
     {
         const EquipmentBox *const box = *it;
@@ -274,9 +274,9 @@ void EquipmentWindow::safeDraw(Graphics *const graphics)
     int i = 0;
     Font *const font = getFont();
     const int fontHeight = font->getHeight();
-    const std::vector<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes;
+    const STD_VECTOR<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes;
 
-    for (std::vector<EquipmentBox*>::const_iterator it = boxes.begin(),
+    for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(),
          it_end = boxes.end(); it != it_end; ++ it, ++ i)
     {
         const EquipmentBox *const box = *it;
@@ -301,7 +301,7 @@ void EquipmentWindow::safeDraw(Graphics *const graphics)
 
     i = 0;
     const int projSlot = inventoryHandler->getProjectileSlot();
-    for (std::vector<EquipmentBox*>::const_iterator it = boxes.begin(),
+    for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(),
          it_end = boxes.end(); it != it_end; ++ it, ++ i)
     {
         const EquipmentBox *const box = *it;
@@ -408,8 +408,8 @@ const Item *EquipmentWindow::getItem(const int x, const int y) const
 
     int i = 0;
 
-    std::vector<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes;
-    for (std::vector<EquipmentBox*>::const_iterator it = boxes.begin(),
+    STD_VECTOR<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes;
+    for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(),
          it_end = boxes.end(); it != it_end; ++ it, ++ i)
     {
         const EquipmentBox *const box = *it;
@@ -446,8 +446,8 @@ void EquipmentWindow::mousePressed(MouseEvent& event)
 
         bool inBox(false);
 
-        std::vector<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes;
-        for (std::vector<EquipmentBox*>::const_iterator it = boxes.begin(),
+        STD_VECTOR<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes;
+        for (STD_VECTOR<EquipmentBox*>::const_iterator it = boxes.begin(),
              it_end = boxes.end(); it != it_end; ++ it, ++ i)
         {
             const EquipmentBox *const box = *it;
@@ -535,8 +535,8 @@ void EquipmentWindow::mouseReleased(MouseEvent &event)
         {
             const int x = event.getX();
             const int y = event.getY();
-            std::vector<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes;
-            for (std::vector<EquipmentBox*>::const_iterator
+            STD_VECTOR<EquipmentBox*> &boxes = mPages[mSelectedTab]->boxes;
+            for (STD_VECTOR<EquipmentBox*>::const_iterator
                  it = boxes.begin(), it_end = boxes.end();
                  it != it_end; ++ it)
             {
@@ -712,7 +712,7 @@ void EquipmentWindow::loadSlot(XmlNodeConstPtr slotNode,
     if (imageIndex >= 0 && imageIndex < CAST_S32(imageset->size()))
         image = imageset->get(imageIndex);
 
-    std::vector<EquipmentBox*> &boxes = mPages[page]->boxes;
+    STD_VECTOR<EquipmentBox*> &boxes = mPages[page]->boxes;
     if (boxes[slot] != nullptr)
     {
         EquipmentBox *const box = boxes[slot];
@@ -811,7 +811,7 @@ void EquipmentWindow::addBox(const int idx, int x, int y, const int imageIndex)
 
     x += getPadding();
     y += getTitleBarHeight() + mYPadding;
-    std::vector<EquipmentBox*> &boxes = mPages[0]->boxes;
+    STD_VECTOR<EquipmentBox*> &boxes = mPages[0]->boxes;
     boxes[idx] = new EquipmentBox(x, y, image);
 
     if (x < mMinX)
@@ -837,7 +837,7 @@ int EquipmentWindow::addPage(const std::string &name)
 {
     EquipmentPage *const page = new EquipmentPage;
     mPages.push_back(page);
-    std::vector<EquipmentBox*> &boxes = page->boxes;
+    STD_VECTOR<EquipmentBox*> &boxes = page->boxes;
 
     boxes.reserve(BOX_COUNT);
     for (int f = 0; f < BOX_COUNT; f ++)
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index 9bd9dd26f..b36174095 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -141,7 +141,7 @@ class EquipmentWindow final : public Window,
         Image *mSlotBackground;
         Image *mSlotHighlightedBackground;
         ImageCollection *mVertexes A_NONNULLPOINTER;
-        std::vector<EquipmentPage*> mPages;
+        STD_VECTOR<EquipmentPage*> mPages;
         TabStrip *mTabs;
         Color mHighlightColor;
         Color mBorderColor;
diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp
index 52f91af06..063f1a29f 100644
--- a/src/gui/windows/mailwindow.cpp
+++ b/src/gui/windows/mailwindow.cpp
@@ -182,7 +182,7 @@ void MailWindow::removeMail(const int id)
 
     mMailModel->clear();
 
-    FOR_EACH (std::vector<MailMessage*>::iterator, it, mMessages)
+    FOR_EACH (STD_VECTOR<MailMessage*>::iterator, it, mMessages)
     {
         MailMessage *message = *it;
         if ((message != nullptr) && message->id == id)
@@ -193,7 +193,7 @@ void MailWindow::removeMail(const int id)
         }
     }
 
-    FOR_EACH (std::vector<MailMessage*>::iterator, it, mMessages)
+    FOR_EACH (STD_VECTOR<MailMessage*>::iterator, it, mMessages)
     {
         MailMessage *message = *it;
         if (message != nullptr)
@@ -223,7 +223,7 @@ void MailWindow::showMessage(MailMessage *const mail)
 
 void MailWindow::viewNext(const int id)
 {
-    FOR_EACH (std::vector<MailMessage*>::iterator, it, mMessages)
+    FOR_EACH (STD_VECTOR<MailMessage*>::iterator, it, mMessages)
     {
         MailMessage *message = *it;
         if ((message != nullptr) && message->id == id)
@@ -247,7 +247,7 @@ void MailWindow::viewNext(const int id)
 
 void MailWindow::viewPrev(const int id)
 {
-    FOR_EACH (std::vector<MailMessage*>::iterator, it, mMessages)
+    FOR_EACH (STD_VECTOR<MailMessage*>::iterator, it, mMessages)
     {
         MailMessage *message = *it;
         if ((message != nullptr) && message->id == id)
diff --git a/src/gui/windows/mailwindow.h b/src/gui/windows/mailwindow.h
index eee7e26bd..40be426d6 100644
--- a/src/gui/windows/mailwindow.h
+++ b/src/gui/windows/mailwindow.h
@@ -68,7 +68,7 @@ class MailWindow final : public Window,
         void createMail(const std::string &to);
 
     private:
-        std::vector<MailMessage*> mMessages;
+        STD_VECTOR<MailMessage*> mMessages;
         std::map<int, MailMessage*> mMessagesMap;
         ExtendedNamesModel *mMailModel;
         ExtendedListBox *mListBox;
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index ec27469ad..ba92a0739 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -55,7 +55,7 @@
 MiniStatusWindow *miniStatusWindow = nullptr;
 extern volatile int tick_time;
 
-typedef std::vector <ProgressBar*>::const_iterator ProgressBarVectorCIter;
+typedef STD_VECTOR <ProgressBar*>::const_iterator ProgressBarVectorCIter;
 
 MiniStatusWindow::MiniStatusWindow() :
     Window("MiniStatus", Modal_false, nullptr, "ministatus.xml"),
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 83d7052ae..4221673a8 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -85,7 +85,7 @@ class MiniStatusWindow final : public Window,
 
         void slotsChanged(const Inventory *const inventory) override final;
 
-        std::vector <ProgressBar*> &getBars() A_WARN_UNUSED
+        STD_VECTOR <ProgressBar*> &getBars() A_WARN_UNUSED
         { return mBars; }
 
         Rect getChildrenArea() override final A_WARN_UNUSED;
@@ -122,9 +122,9 @@ class MiniStatusWindow final : public Window,
 
         void saveBars() const;
 
-        std::vector <ProgressBar*> mBars;
+        STD_VECTOR <ProgressBar*> mBars;
         std::map <std::string, ProgressBar*> mBarNames;
-        std::vector<AnimatedSprite *> mIcons;
+        STD_VECTOR<AnimatedSprite *> mIcons;
 
         /*
          * Mini Status Bars
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 25c1899a0..fb38dcc72 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -92,7 +92,7 @@
 NpcDialog::DialogList NpcDialog::instances;
 NpcDialogs NpcDialog::mNpcDialogs;
 
-typedef std::vector<Image *>::iterator ImageVectorIter;
+typedef STD_VECTOR<Image *>::iterator ImageVectorIter;
 
 NpcDialog::NpcDialog(const BeingId npcId) :
     // TRANSLATORS: npc dialog name
@@ -1275,7 +1275,7 @@ void NpcDialog::createSkinControls()
     if (mDialogInfo == nullptr)
         return;
 
-    FOR_EACH (std::vector<NpcImageInfo*>::const_iterator,
+    FOR_EACH (STD_VECTOR<NpcImageInfo*>::const_iterator,
         it,
         mDialogInfo->menu.images)
     {
@@ -1288,7 +1288,7 @@ void NpcDialog::createSkinControls()
             mSkinContainer->add(icon);
         }
     }
-    FOR_EACH (std::vector<NpcTextInfo*>::const_iterator,
+    FOR_EACH (STD_VECTOR<NpcTextInfo*>::const_iterator,
         it,
         mDialogInfo->menu.texts)
     {
@@ -1314,7 +1314,7 @@ void NpcDialog::createSkinControls()
             box->addRow(*it2);
         }
     }
-    FOR_EACH (std::vector<NpcButtonInfo*>::const_iterator,
+    FOR_EACH (STD_VECTOR<NpcButtonInfo*>::const_iterator,
         it,
         mDialogInfo->menu.buttons)
     {
@@ -1347,7 +1347,7 @@ std::string NpcDialog::complexItemToStr(const ComplexItem *const item)
     std::string str;
     if (item != nullptr)
     {
-        const std::vector<Item*> &items = item->getChilds();
+        const STD_VECTOR<Item*> &items = item->getChilds();
         const size_t sz = items.size();
         if (sz == 0u)
             return str;
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 8e041b087..4680d774d 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -279,7 +279,7 @@ class NpcDialog final : public Window,
 
         // Used for choice input
         StringVect mItems;
-        std::vector<Image *> mImages;
+        STD_VECTOR<Image *> mImages;
         ExtendedListBox *mItemList A_NONNULLPOINTER;
         ScrollArea *mListScrollArea A_NONNULLPOINTER;
         Container *mSkinContainer A_NONNULLPOINTER;
@@ -308,7 +308,7 @@ class NpcDialog final : public Window,
 
         NpcInputStateT mInputState;
         NpcActionStateT mActionState;
-        std::vector<Widget*> mSkinControls;
+        STD_VECTOR<Widget*> mSkinControls;
         std::string mSkinName;
         PlayerBox *mPlayerBox A_NONNULLPOINTER;
         Being *mAvatarBeing;
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index 51254e9a0..5a5608d4e 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -148,7 +148,7 @@ void OutfitWindow::load()
         std::string buf;
         std::stringstream ss(outfit);
 
-        std::vector<int> tokens;
+        STD_VECTOR<int> tokens;
 
         while (ss >> buf)
             tokens.push_back(atoi(buf.c_str()));
@@ -164,7 +164,7 @@ void OutfitWindow::load()
 
         tokens.clear();
 
-        std::vector<unsigned char> tokens2;
+        STD_VECTOR<unsigned char> tokens2;
         while (ss2 >> buf)
             tokens2.push_back(CAST_U8(atoi(buf.c_str())));
 
@@ -734,7 +734,7 @@ std::string OutfitWindow::getOutfitString() const
             continue;
 
         const ItemColor color = mItemColors[mCurrentOutfit][i];
-        std::vector<int> ids;
+        STD_VECTOR<int> ids;
         ids.push_back(id);
         ids.push_back(CAST_S32(color));
 
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index af9f19369..1eb2da841 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -187,10 +187,10 @@ void QuestsWindow::rebuild(const bool playSound)
     mQuestLinks.clear();
     mQuestReverseLinks.clear();
     StringVect &names = mQuestsModel->getNames();
-    std::vector<Image*> &images = mQuestsModel->getImages();
-    std::vector<QuestItem*> complete;
-    std::vector<QuestItem*> incomplete;
-    std::vector<QuestItem*> hidden;
+    STD_VECTOR<Image*> &images = mQuestsModel->getImages();
+    STD_VECTOR<QuestItem*> complete;
+    STD_VECTOR<QuestItem*> incomplete;
+    STD_VECTOR<QuestItem*> hidden;
     int updatedQuest = -1;
     int newCompleteStatus = -1;
 
@@ -198,8 +198,8 @@ void QuestsWindow::rebuild(const bool playSound)
     {
         const int var = (*it).first;
         const QuestVar &val = (*it).second;
-        const std::vector<QuestItem*> &quests = (*mQuests)[var];
-        FOR_EACH (std::vector<QuestItem*>::const_iterator, it2, quests)
+        const STD_VECTOR<QuestItem*> &quests = (*mQuests)[var];
+        FOR_EACH (STD_VECTOR<QuestItem*>::const_iterator, it2, quests)
         {
             if (*it2 == nullptr)
                 continue;
@@ -225,7 +225,7 @@ void QuestsWindow::rebuild(const bool playSound)
 
     int k = 0;
 
-    for (std::vector<QuestItem*>::const_iterator it = complete.begin(),
+    for (STD_VECTOR<QuestItem*>::const_iterator it = complete.begin(),
         it_end = complete.end(); it != it_end; ++ it, k ++)
     {
         QuestItem *const quest = *it;
@@ -250,7 +250,7 @@ void QuestsWindow::rebuild(const bool playSound)
         }
     }
 
-    for (std::vector<QuestItem*>::const_iterator it = incomplete.begin(),
+    for (STD_VECTOR<QuestItem*>::const_iterator it = incomplete.begin(),
         it_end = incomplete.end(); it != it_end; ++ it, k ++)
     {
         QuestItem *const quest = *it;
@@ -274,7 +274,7 @@ void QuestsWindow::rebuild(const bool playSound)
         }
     }
 
-    FOR_EACH (std::vector<QuestItem*>::const_iterator, it, hidden)
+    FOR_EACH (STD_VECTOR<QuestItem*>::const_iterator, it, hidden)
         (*it)->completeFlag = -1;
 
     if (updatedQuest == -1 || updatedQuest >= CAST_S32(
@@ -310,14 +310,14 @@ void QuestsWindow::showQuest(const QuestItem *const quest)
     if (quest == nullptr)
         return;
 
-    const std::vector<QuestItemText> &texts = quest->texts;
+    const STD_VECTOR<QuestItemText> &texts = quest->texts;
     const QuestVar &var = (*mVars)[quest->var];
     const std::string var1 = toString(var.var1);
     const std::string var2 = toString(var.var2);
     const std::string var3 = toString(var.var3);
     const std::string timeStr = timeDiffToString(var.time1);
     mText->clearRows();
-    FOR_EACH (std::vector<QuestItemText>::const_iterator, it, texts)
+    FOR_EACH (STD_VECTOR<QuestItemText>::const_iterator, it, texts)
     {
         const QuestItemText &data = *it;
         std::string text = data.text;
@@ -379,7 +379,7 @@ void QuestsWindow::setMap(const Map *const map)
             return;
 
         const std::string name = mMap->getProperty("shortName");
-        FOR_EACHP (std::vector<QuestEffect*>::const_iterator, it,  mAllEffects)
+        FOR_EACHP (STD_VECTOR<QuestEffect*>::const_iterator, it,  mAllEffects)
         {
             const QuestEffect *const effect = *it;
             if ((effect != nullptr) && name == effect->map)
@@ -394,7 +394,7 @@ void QuestsWindow::updateEffects()
     NpcQuestEffectMap oldNpc = mNpcEffects;
     mNpcEffects.clear();
 
-    FOR_EACH (std::vector<const QuestEffect*>::const_iterator,
+    FOR_EACH (STD_VECTOR<const QuestEffect*>::const_iterator,
               it,  mMapEffects)
     {
         const QuestEffect *const effect = *it;
diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h
index b5be44d12..680ae6271 100644
--- a/src/gui/windows/questswindow.h
+++ b/src/gui/windows/questswindow.h
@@ -86,14 +86,14 @@ class QuestsWindow final : public Window,
         Button *mCloseButton A_NONNULLPOINTER;
         Image *mCompleteIcon;
         Image *mIncompleteIcon;
-        std::vector<const QuestEffect*> mMapEffects;
+        STD_VECTOR<const QuestEffect*> mMapEffects;
         NpcQuestVarMap *mVars;
-        std::map<int, std::vector<QuestItem*> > *mQuests;
-        std::vector<QuestEffect*> *mAllEffects;
+        std::map<int, STD_VECTOR<QuestItem*> > *mQuests;
+        STD_VECTOR<QuestEffect*> *mAllEffects;
 
         // npc effects for current map and values: npc, effect
         NpcQuestEffectMap mNpcEffects;
-        std::vector<QuestItem*> mQuestLinks;
+        STD_VECTOR<QuestItem*> mQuestLinks;
         std::map<int, int> mQuestReverseLinks;
         int mNewQuestEffectId;
         int mCompleteQuestEffectId;
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index e04b28d18..b9ef417c3 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -229,8 +229,8 @@ void QuitDialog::keyPressed(KeyEvent &event)
 
     if (dir != 0)
     {
-        std::vector<RadioButton*>::const_iterator it = mOptions.begin();
-        const std::vector<RadioButton*>::const_iterator
+        STD_VECTOR<RadioButton*>::const_iterator it = mOptions.begin();
+        const STD_VECTOR<RadioButton*>::const_iterator
             it_end = mOptions.end();
 
         for (; it < it_end; ++it)
diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h
index 1e0197f87..e12e13e7b 100644
--- a/src/gui/windows/quitdialog.h
+++ b/src/gui/windows/quitdialog.h
@@ -67,7 +67,7 @@ class QuitDialog final : public Window,
     private:
         void placeOption(ContainerPlacer &placer,
                          RadioButton *const option);
-        std::vector<RadioButton*> mOptions;
+        STD_VECTOR<RadioButton*> mOptions;
 
         RadioButton *mLogoutQuit A_NONNULLPOINTER;
         RadioButton *mForceQuit A_NONNULLPOINTER;
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 6093b67b4..ab630e960 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -505,7 +505,7 @@ static void loadHostsGroup(XmlNodeConstPtr node,
 }
 
 static void loadServerSourcesList(XmlNodeConstPtr node,
-                                  std::vector<ServerUrlInfo> &list)
+                                  STD_VECTOR<ServerUrlInfo> &list)
 {
     for_each_xml_child_node(urlNode, node)
     {
diff --git a/src/gui/windows/serverinfowindow.cpp b/src/gui/windows/serverinfowindow.cpp
index d1eb8cb44..20f8d5f42 100644
--- a/src/gui/windows/serverinfowindow.cpp
+++ b/src/gui/windows/serverinfowindow.cpp
@@ -136,14 +136,14 @@ void ServerInfoWindow::showServerInfo()
     mBrowserBox->updateHeight();
 }
 
-void ServerInfoWindow::addSourcesList(const std::vector<ServerUrlInfo> &list,
+void ServerInfoWindow::addSourcesList(const STD_VECTOR<ServerUrlInfo> &list,
                                       const std::string &comment)
 {
     if (!list.empty())
     {
         mBrowserBox->addRow("");
         mBrowserBox->addRow(comment);
-        FOR_EACH (std::vector<ServerUrlInfo>::const_iterator, it, list)
+        FOR_EACH (STD_VECTOR<ServerUrlInfo>::const_iterator, it, list)
         {
             const ServerUrlInfo &info = *it;
             addServerComment(info.url,
diff --git a/src/gui/windows/serverinfowindow.h b/src/gui/windows/serverinfowindow.h
index 810c5b0c3..d872b1fdf 100644
--- a/src/gui/windows/serverinfowindow.h
+++ b/src/gui/windows/serverinfowindow.h
@@ -51,7 +51,7 @@ class ServerInfoWindow final : public Window,
     protected:
         void showServerInfo();
 
-        void addSourcesList(const std::vector<ServerUrlInfo> &list,
+        void addSourcesList(const STD_VECTOR<ServerUrlInfo> &list,
                             const std::string &comment);
 
         void addServerComment(const std::string &url,
diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp
index 40354f62a..6228ecd45 100644
--- a/src/gui/windows/setupwindow.cpp
+++ b/src/gui/windows/setupwindow.cpp
@@ -317,7 +317,7 @@ void SetupWindow::widgetResized(const Event &event)
     const int height = area.height;
     const int width = area.width;
     mPanel->setDimension(Rect(5, 5, width - 10, height - 40));
-    FOR_EACH (std::vector<Button*>::iterator, it, mButtons)
+    FOR_EACH (STD_VECTOR<Button*>::iterator, it, mButtons)
     {
         Button *const btn = *it;
         x -= btn->getWidth() + mButtonPadding;
diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h
index cb8a3af18..79a11a469 100644
--- a/src/gui/windows/setupwindow.h
+++ b/src/gui/windows/setupwindow.h
@@ -82,7 +82,7 @@ class SetupWindow final : public Window,
 
         std::list<SetupTab*> mTabs;
         std::list<Window*> mWindowsToReset;
-        std::vector<Button*> mButtons;
+        STD_VECTOR<Button*> mButtons;
         SetupTab *mModsTab;
         SetupTab *mQuickTab;
         Button *mResetWindows;
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 9ff15b024..0e55bcca1 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -318,7 +318,7 @@ void ShopWindow::action(const ActionEvent &event)
             }
             else
             {
-                std::vector<ShopItem*> &items = mBuyShopItems->items();
+                STD_VECTOR<ShopItem*> &items = mBuyShopItems->items();
                 if (!items.empty())
                 {
                     buyingStoreHandler->create(mSellShopName,
@@ -337,12 +337,12 @@ void ShopWindow::action(const ActionEvent &event)
             }
             else
             {
-                std::vector<ShopItem*> &oldItems = mSellShopItems->items();
-                std::vector<ShopItem*> items;
+                STD_VECTOR<ShopItem*> &oldItems = mSellShopItems->items();
+                STD_VECTOR<ShopItem*> items;
                 const Inventory *const inv = PlayerInfo::getCartInventory();
                 if (inv == nullptr)
                     return;
-                FOR_EACH (std::vector<ShopItem*>::iterator, it, oldItems)
+                FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, oldItems)
                 {
                     ShopItem *const item = *it;
                     if (item == nullptr)
@@ -551,7 +551,7 @@ void ShopWindow::loadList()
             const std::string str = line;
             if (!str.empty())
             {
-                std::vector<int> tokens;
+                STD_VECTOR<int> tokens;
                 std::stringstream ss(str);
 
                 while (ss >> buf)
@@ -600,8 +600,8 @@ void ShopWindow::saveList() const
         return;
     }
 
-    std::vector<ShopItem*> items = mBuyShopItems->items();
-    FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+    STD_VECTOR<ShopItem*> items = mBuyShopItems->items();
+    FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
     {
         ShopItem *const item = *(it);
         if (item != nullptr)
@@ -609,7 +609,7 @@ void ShopWindow::saveList() const
     }
 
     items = mSellShopItems->items();
-    FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+    FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
     {
         if ((*it) == nullptr)
             continue;
@@ -672,9 +672,9 @@ void ShopWindow::announce(ShopItems *const list, const int mode)
     if (mAnnounceButton != nullptr)
         mAnnounceButton->setEnabled(false);
 
-    std::vector<ShopItem*> items = list->items();
+    STD_VECTOR<ShopItem*> items = list->items();
 
-    FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+    FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
     {
         const ShopItem *const item = *(it);
         if (item->getQuantity() > 1)
@@ -760,9 +760,9 @@ void ShopWindow::giveList(const std::string &nick, const int mode)
     if (inv == nullptr)
         return;
 
-    std::vector<ShopItem*> items = list->items();
+    STD_VECTOR<ShopItem*> items = list->items();
 
-    FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+    FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
     {
         const ShopItem *const item = *(it);
         if (item == nullptr)
@@ -1064,13 +1064,13 @@ bool ShopWindow::findShopItem(const ShopItem *const shopItem,
     if (shopItem == nullptr)
         return false;
 
-    std::vector<ShopItem*> items;
+    STD_VECTOR<ShopItem*> items;
     if (mode == SELL)
         items = mSellShopItems->items();
     else
         items = mBuyShopItems->items();
 
-    FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+    FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
     {
         const ShopItem *const item = *(it);
         if (item == nullptr)
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 61a7e6b45..1bb35d3f1 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -243,7 +243,7 @@ void ShortcutWindow::widgetMoved(const Event& event)
     Window::widgetMoved(event);
     if (mItems != nullptr)
         mItems->setRedraw(true);
-    FOR_EACH (std::vector<ShortcutContainer*>::iterator, it, mPages)
+    FOR_EACH (STD_VECTOR<ShortcutContainer*>::iterator, it, mPages)
         (*it)->setRedraw(true);
 }
 
diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h
index 0486dd830..f21c505c5 100644
--- a/src/gui/windows/shortcutwindow.h
+++ b/src/gui/windows/shortcutwindow.h
@@ -86,7 +86,7 @@ class ShortcutWindow final : public Window
 
         ScrollArea *mScrollArea A_NONNULLPOINTER;
         TabbedArea *mTabs;
-        std::vector<ShortcutContainer*> mPages;
+        STD_VECTOR<ShortcutContainer*> mPages;
         int mButtonIndex;
 
         static int mBoxesWidth;
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 52dd067ea..ae6b72a35 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -732,7 +732,7 @@ void SkillDialog::useItem(const int itemId,
 
     if (!data.empty())
     {
-        std::vector<int> vect;
+        STD_VECTOR<int> vect;
         splitToIntVector(vect, data, ' ');
         const size_t sz = vect.size();
         if (sz > 0)
@@ -1250,7 +1250,7 @@ void SkillDialog::addSkillDuration(SkillInfo *const skill)
     if (skill == nullptr)
         return;
 
-    FOR_EACH (std::vector<SkillInfo*>::const_iterator, it, mDurations)
+    FOR_EACH (STD_VECTOR<SkillInfo*>::const_iterator, it, mDurations)
     {
         if ((*it)->id == skill->id)
             return;
@@ -1260,7 +1260,7 @@ void SkillDialog::addSkillDuration(SkillInfo *const skill)
 
 void SkillDialog::slowLogic()
 {
-    FOR_EACH_SAFE (std::vector<SkillInfo*>::iterator, it, mDurations)
+    FOR_EACH_SAFE (STD_VECTOR<SkillInfo*>::iterator, it, mDurations)
     {
         SkillInfo *const skill = *it;
         if (skill != nullptr)
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 0c19f9308..ab65f9f1b 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -219,7 +219,7 @@ class SkillDialog final : public Window,
 
         typedef std::map<int, SkillInfo*> SkillMap;
         SkillMap mSkills;
-        std::vector<SkillInfo*> mDurations;
+        STD_VECTOR<SkillInfo*> mDurations;
         TabbedArea *mTabs A_NONNULLPOINTER;
         std::list<Tab*> mDeleteTabs;
         Label *mPointsLabel A_NONNULLPOINTER;
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 6553c8dc5..e313cbc77 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -236,8 +236,8 @@ void StatusWindow::addTabs()
 {
     // TRANSLATORS: status window tab name
     addTabBasic(_("Basic"));
-    const std::vector<std::string> &pages = StatDb::getPages();
-    FOR_EACH(std::vector<std::string>::const_iterator, it, pages)
+    const STD_VECTOR<std::string> &pages = StatDb::getPages();
+    FOR_EACH(STD_VECTOR<std::string>::const_iterator, it, pages)
     {
         addTab(*it);
     }
diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h
index ddeee2d4c..01277c220 100644
--- a/src/gui/windows/statuswindow.h
+++ b/src/gui/windows/statuswindow.h
@@ -100,7 +100,7 @@ class StatusWindow final : public Window,
         static std::string translateLetter(const char *const letters);
         static std::string translateLetter2(const std::string &letters);
 
-        std::vector<StatsPage*> mPages;
+        STD_VECTOR<StatsPage*> mPages;
 
         TabbedArea *mTabs A_NONNULLPOINTER;
         Label *mLvlLabel A_NONNULLPOINTER;
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index db7d48c36..3858b0a5e 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -75,10 +75,10 @@ const std::string updateServer5
 /**
  * Load the given file into a vector of updateFiles.
  */
-static std::vector<UpdateFile> loadXMLFile(const std::string &fileName,
+static STD_VECTOR<UpdateFile> loadXMLFile(const std::string &fileName,
                                            const bool loadMods)
 {
-    std::vector<UpdateFile> files;
+    STD_VECTOR<UpdateFile> files;
     XML::Document doc(fileName, UseVirtFs_false, SkipError_false);
     XmlNodeConstPtrConst rootNode = doc.rootNode();
 
@@ -129,9 +129,9 @@ static std::vector<UpdateFile> loadXMLFile(const std::string &fileName,
     return files;
 }
 
-static std::vector<UpdateFile> loadTxtFile(const std::string &fileName)
+static STD_VECTOR<UpdateFile> loadTxtFile(const std::string &fileName)
 {
-    std::vector<UpdateFile> files;
+    STD_VECTOR<UpdateFile> files;
     std::ifstream fileHandler;
     fileHandler.open(fileName.c_str(), std::ios::in);
 
@@ -242,7 +242,7 @@ UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost,
 
     if (mUpdateHost.empty())
     {
-        const std::vector<std::string> &mirrors = settings.updateMirrors;
+        const STD_VECTOR<std::string> &mirrors = settings.updateMirrors;
         if (mirrors.begin() != mirrors.end())
             mUpdateHost = *mirrors.begin();
         mSkipPatches = true;
@@ -613,8 +613,8 @@ void UpdaterWindow::download()
         }
         else
         {
-            const std::vector<std::string> &mirrors = settings.updateMirrors;
-            FOR_EACH (std::vector<std::string>::const_iterator, it, mirrors)
+            const STD_VECTOR<std::string> &mirrors = settings.updateMirrors;
+            FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, mirrors)
             {
                 mDownload->addMirror(pathJoin(*it,
                     mCurrentFile));
@@ -683,7 +683,7 @@ void UpdaterWindow::loadUpdates()
 
 void UpdaterWindow::loadLocalUpdates(const std::string &dir)
 {
-    std::vector<UpdateFile> updateFiles = loadXMLFile(
+    STD_VECTOR<UpdateFile> updateFiles = loadXMLFile(
         pathJoin(dir, xmlUpdateFile),
         false);
 
@@ -716,7 +716,7 @@ void UpdaterWindow::loadLocalUpdates(const std::string &dir)
 
 void UpdaterWindow::unloadUpdates(const std::string &dir)
 {
-    std::vector<UpdateFile> updateFiles = loadXMLFile(
+    STD_VECTOR<UpdateFile> updateFiles = loadXMLFile(
         pathJoin(dir, xmlUpdateFile),
         true);
 
@@ -742,7 +742,7 @@ void UpdaterWindow::unloadUpdates(const std::string &dir)
 void UpdaterWindow::loadManaPlusUpdates(const std::string &dir)
 {
     std::string fixPath = dir + "/fix";
-    std::vector<UpdateFile> updateFiles = loadXMLFile(
+    STD_VECTOR<UpdateFile> updateFiles = loadXMLFile(
         pathJoin(fixPath, xmlUpdateFile),
         false);
 
@@ -772,7 +772,7 @@ void UpdaterWindow::loadManaPlusUpdates(const std::string &dir)
 void UpdaterWindow::unloadManaPlusUpdates(const std::string &dir)
 {
     const std::string fixPath = dir + "/fix";
-    const std::vector<UpdateFile> updateFiles = loadXMLFile(
+    const STD_VECTOR<UpdateFile> updateFiles = loadXMLFile(
         pathJoin(fixPath, xmlUpdateFile),
         true);
 
@@ -1100,7 +1100,7 @@ void UpdaterWindow::loadFile(std::string file)
 }
 
 void UpdaterWindow::loadMods(const std::string &dir,
-                             const std::vector<UpdateFile> &updateFiles)
+                             const STD_VECTOR<UpdateFile> &updateFiles)
 {
     ModDB::load();
     std::string modsString = serverConfig.getValue("mods", "");
@@ -1127,7 +1127,7 @@ void UpdaterWindow::loadMods(const std::string &dir,
         }
     }
 
-    std::vector<UpdateFile> updateFiles2 = loadXMLFile(
+    STD_VECTOR<UpdateFile> updateFiles2 = loadXMLFile(
         pathJoin(fixPath, xmlUpdateFile),
         true);
 
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index f4d2a80f6..661168a9f 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -137,7 +137,7 @@ class UpdaterWindow final : public Window,
         static unsigned long getFileHash(const std::string &filePath);
 
         static void loadMods(const std::string &dir,
-                             const std::vector<UpdateFile> &updateFiles);
+                             const STD_VECTOR<UpdateFile> &updateFiles);
 
         static void loadDirMods(const std::string &dir);
 
@@ -199,10 +199,10 @@ class UpdaterWindow final : public Window,
         Net::Download *mDownload;
 
         /** List of files to download. */
-        std::vector<UpdateFile> mUpdateFiles;
+        STD_VECTOR<UpdateFile> mUpdateFiles;
 
         /** List of temp files to download. */
-        std::vector<UpdateFile> mTempUpdateFiles;
+        STD_VECTOR<UpdateFile> mTempUpdateFiles;
 
         std::string mUpdateServerPath;
 
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index c1e5ffb12..79fe66a4f 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -245,7 +245,7 @@ void WhoIsOnline::updateWindow(size_t numOnline)
     std::sort(mNeutral.begin(), mNeutral.end(), nameCompare);
     std::sort(mDisregard.begin(), mDisregard.end(), nameCompare);
     bool addedFromSection(false);
-    FOR_EACH (std::vector<OnlinePlayer*>::const_iterator, it, mFriends)
+    FOR_EACH (STD_VECTOR<OnlinePlayer*>::const_iterator, it, mFriends)
     {
         mBrowserBox->addRow((*it)->getText());
         addedFromSection = true;
@@ -255,7 +255,7 @@ void WhoIsOnline::updateWindow(size_t numOnline)
         mBrowserBox->addRow("---");
         addedFromSection = false;
     }
-    FOR_EACH (std::vector<OnlinePlayer*>::const_iterator, it, mEnemy)
+    FOR_EACH (STD_VECTOR<OnlinePlayer*>::const_iterator, it, mEnemy)
     {
         mBrowserBox->addRow((*it)->getText());
         addedFromSection = true;
@@ -265,7 +265,7 @@ void WhoIsOnline::updateWindow(size_t numOnline)
         mBrowserBox->addRow("---");
         addedFromSection = false;
     }
-    FOR_EACH (std::vector<OnlinePlayer*>::const_iterator, it, mNeutral)
+    FOR_EACH (STD_VECTOR<OnlinePlayer*>::const_iterator, it, mNeutral)
     {
         mBrowserBox->addRow((*it)->getText());
         addedFromSection = true;
@@ -273,7 +273,7 @@ void WhoIsOnline::updateWindow(size_t numOnline)
     if (addedFromSection == true && !mDisregard.empty())
         mBrowserBox->addRow("---");
 
-    FOR_EACH (std::vector<OnlinePlayer*>::const_iterator, it, mDisregard)
+    FOR_EACH (STD_VECTOR<OnlinePlayer*>::const_iterator, it, mDisregard)
         mBrowserBox->addRow((*it)->getText());
 
     if (mScrollArea->getVerticalMaxScroll() <
@@ -324,7 +324,7 @@ void WhoIsOnline::handlerPlayerRelation(const std::string &nick,
     }
 }
 
-void WhoIsOnline::loadList(const std::vector<OnlinePlayer*> &list)
+void WhoIsOnline::loadList(const STD_VECTOR<OnlinePlayer*> &list)
 {
     mBrowserBox->clearRows();
     const size_t numOnline = list.size();
@@ -336,7 +336,7 @@ void WhoIsOnline::loadList(const std::vector<OnlinePlayer*> &list)
 
     mShowLevel = config.getBoolValue("showlevel");
 
-    FOR_EACH (std::vector<OnlinePlayer*>::const_iterator, it, list)
+    FOR_EACH (STD_VECTOR<OnlinePlayer*>::const_iterator, it, list)
     {
         OnlinePlayer *player = *it;
         const std::string nick = player->getNick();
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index 9f2fdf705..0eb316197 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -65,7 +65,7 @@ class WhoIsOnline final : public Window,
         void loadWebList();
 #endif  // TMWA_SUPPORT
 
-        void loadList(const std::vector<OnlinePlayer*> &list);
+        void loadList(const STD_VECTOR<OnlinePlayer*> &list);
 
         void handleLink(const std::string& link,
                         MouseEvent *event) override final;
@@ -154,10 +154,10 @@ class WhoIsOnline final : public Window,
         std::set<OnlinePlayer*> mOnlinePlayers;
         std::set<std::string> mOnlineNicks;
 
-        std::vector<OnlinePlayer*> mFriends;
-        std::vector<OnlinePlayer*> mNeutral;
-        std::vector<OnlinePlayer*> mDisregard;
-        std::vector<OnlinePlayer*> mEnemy;
+        STD_VECTOR<OnlinePlayer*> mFriends;
+        STD_VECTOR<OnlinePlayer*> mNeutral;
+        STD_VECTOR<OnlinePlayer*> mDisregard;
+        STD_VECTOR<OnlinePlayer*> mEnemy;
 
         /** Byte count currently downloaded in mMemoryBuffer. */
         int mDownloadedBytes;
-- 
cgit v1.2.3-60-g2f50