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.

32 files changed, 84 insertions, 84 deletions

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;
 };