Get rid of DECLARE_STL_VECTOR

Change-Id: If4588034fc09e4663b5217669c71f26c0a3b8c8a

41 files changed, 161 insertions, 122 deletions

diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index e5df9bafa3ce..ef4358bd6d63 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -20,9 +20,12 @@
 #ifndef BASCTL_PROPBRW_HXX
 #define BASCTL_PROPBRW_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XFrame2.hpp>
-#include <comphelper/stl_types.hxx>
 #include <svl/lstner.hxx>
 #include <svl/brdcst.hxx>
 #include <svx/svdmark.hxx>
@@ -56,7 +59,7 @@ protected:
     virtual void Resize();
     virtual sal_Bool Close();
 
-    DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>, InterfaceArray);
+    typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > InterfaceArray;
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >
         CreateMultiSelectionSequence( const SdrMarkList& _rMarkList );
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 6a4d4c8711e5..6a4643bc2df0 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -19,6 +19,11 @@
 #ifndef _CONNECTIVITY_ZCONNECTIONPOOL_HXX_
 #define _CONNECTIVITY_ZCONNECTIONPOOL_HXX_
 
+#include <sal/config.h>
+
+#include <map>
+#include <vector>
+
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/sdbc/XPooledConnection.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
@@ -27,7 +32,6 @@
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/stl_types.hxx>
 #include <osl/mutex.hxx>
 #include <salhelper/timer.hxx>
 #include <rtl/ref.hxx>
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 0ca1cf4afa6e..a61c2f976aa3 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -20,6 +20,10 @@
 #ifndef _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
 #define _CONNECTIVITY_FDATABASEMETADATARESULTSET_HXX_
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
@@ -63,8 +67,8 @@ namespace connectivity
     {
 
     public:
-        DECLARE_STL_VECTOR(ORowSetValueDecoratorRef,ORow);
-        DECLARE_STL_VECTOR(ORow, ORows);
+        typedef std::vector<ORowSetValueDecoratorRef> ORow;
+        typedef std::vector<ORow> ORows;
 
         enum MetaDataResultSetType
         {
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 20aec320242a..02f3a9ce4001 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -29,7 +29,6 @@
 
 #include <tools/diagnose_ex.h>
 #include <comphelper/extract.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -38,6 +37,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <vector>
 
 #include <o3tl/compat_functional.hxx>
 
@@ -66,9 +66,9 @@ class ODriverEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
 {
     friend class OSDBCDriverManager;
 
-    DECLARE_STL_VECTOR( Reference< XDriver >, DriverArray );
+    typedef std::vector< Reference< XDriver > > DriverArray;
     DriverArray                 m_aDrivers;
-    ConstDriverArrayIterator    m_aPos;
+    DriverArray::const_iterator m_aPos;
     // order matters!
 
 protected:
@@ -371,7 +371,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
         const OUString* pDriverOrderEnd  =   pDriverOrder +  aDriverOrder.getLength();
 
         // the first driver for which there is no preference
-        DriverAccessArrayIterator aNoPrefDriversStart = m_aDriversBS.begin();
+        DriverAccessArray::iterator aNoPrefDriversStart = m_aDriversBS.begin();
             // at the moment this is the first of all drivers we know
 
         for ( ; ( pDriverOrder < pDriverOrderEnd ) && ( aNoPrefDriversStart != m_aDriversBS.end() ); ++pDriverOrder )
@@ -380,7 +380,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
             driver_order.sImplementationName = *pDriverOrder;
 
             // look for the impl name in the DriverAccess array
-            ::std::pair< DriverAccessArrayIterator, DriverAccessArrayIterator > aPos =
+            ::std::pair< DriverAccessArray::iterator, DriverAccessArray::iterator > aPos =
                 ::std::equal_range( aNoPrefDriversStart, m_aDriversBS.end(), driver_order, CompareDriverAccessByName() );
 
             if ( aPos.first != aPos.second )
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 85bfec4720c4..c5cb4e855334 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <map>
+#include <vector>
 
 #include <com/sun/star/sdbc/XDriverManager2.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -33,7 +34,6 @@
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 
 #include <cppuhelper/implbase3.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/logging.hxx>
 #include <osl/mutex.hxx>
 #include "connectivity/DriversConfig.hxx"
@@ -69,7 +69,7 @@ namespace drivermanager
         css::uno::Reference<css::uno::XComponentContext>  m_xContext;
         ::comphelper::EventLogger       m_aEventLogger;
 
-        DECLARE_STL_VECTOR(DriverAccess, DriverAccessArray);
+        typedef std::vector<DriverAccess> DriverAccessArray;
         DriverAccessArray               m_aDriversBS;
 
         // for drivers registered at runtime (not bootstrapped) we don't require an XServiceInfo interface,
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 26a68c867c51..3a40015c9ff1 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLSETTINGS_HXX
 #define INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLSETTINGS_HXX
 
-#include <comphelper/stl_types.hxx>
+#include <sal/config.h>
+
+#include <vector>
+
 #include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
 
@@ -50,12 +53,12 @@ namespace offapp
     class DriverPoolingSettings
     {
     protected:
-        DECLARE_STL_VECTOR( DriverPooling, DriverSettings );
+        typedef std::vector<DriverPooling> DriverSettings;
         DriverSettings      m_aDrivers;
 
     public:
-        typedef ConstDriverSettingsIterator const_iterator;
-        typedef DriverSettingsIterator      iterator;
+        typedef DriverSettings::const_iterator const_iterator;
+        typedef DriverSettings::iterator iterator;
 
     public:
         DriverPoolingSettings();
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index f3a72bcb20d1..3778325f3dd6 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -272,7 +272,7 @@ Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames(  ) throw(Runt
     Sequence< OUString > aNames(m_aBookmarks.size());
     OUString* pNames = aNames.getArray();
     ;
-    for (   ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin();
+    for (   MapIteratorVector::const_iterator aNameIter = m_aBookmarksIndexed.begin();
             aNameIter != m_aBookmarksIndexed.end();
             ++pNames, ++aNameIter
         )
@@ -297,7 +297,7 @@ void OBookmarkContainer::implRemove(const OUString& _rName)
 
     // look for the name in the index access vector
     MapString2String::iterator aMapPos = m_aBookmarks.end();
-    for (   MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin();
+    for (   MapIteratorVector::iterator aSearch = m_aBookmarksIndexed.begin();
             aSearch != m_aBookmarksIndexed.end();
             ++aSearch
         )
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
index 60de25f2632d..afd2b2530b00 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
@@ -23,10 +23,10 @@
 #include <sal/config.h>
 
 #include <map>
+#include <vector>
 
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/implbase6.hxx>
-#include <comphelper/stl_types.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -57,7 +57,7 @@ class OBookmarkContainer
 {
 protected:
     typedef std::map<OUString, OUString> MapString2String;
-    DECLARE_STL_VECTOR(MapString2String::iterator, MapIteratorVector);
+    typedef std::vector<MapString2String::iterator> MapIteratorVector;
 
     MapString2String        m_aBookmarks;           // the bookmarks itself
     MapIteratorVector       m_aBookmarksIndexed;    // for index access to the
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 6f3b68234ce3..8863b10e7916 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -487,8 +487,8 @@ void OConnection::disposing()
     OSubComponent::disposing();
     OConnectionWrapper::disposing();
 
-    OWeakRefArrayIterator aEnd = m_aStatements.end();
-    for (OWeakRefArrayIterator i = m_aStatements.begin(); aEnd != i; ++i)
+    OWeakRefArray::iterator aEnd = m_aStatements.end();
+    for (OWeakRefArray::iterator i = m_aStatements.begin(); aEnd != i; ++i)
     {
         Reference<XComponent> xComp(i->get(),UNO_QUERY);
         ::comphelper::disposeComponent(xComp);
@@ -503,8 +503,8 @@ void OConnection::disposing()
 
     ::comphelper::disposeComponent(m_xQueries);
 
-    OWeakRefArrayIterator aComposerEnd = m_aComposers.end();
-    for (OWeakRefArrayIterator j = m_aComposers.begin(); aComposerEnd != j; ++j)
+    OWeakRefArray::iterator aComposerEnd = m_aComposers.end();
+    for (OWeakRefArray::iterator j = m_aComposers.begin(); aComposerEnd != j; ++j)
     {
         Reference<XComponent> xComp(j->get(),UNO_QUERY);
         ::comphelper::disposeComponent(xComp);
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index 983f43f2fd6f..8318769f6928 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -23,10 +23,10 @@
 #include <sal/config.h>
 
 #include <map>
+#include <vector>
 
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/implbase7.hxx>
-#include <comphelper/stl_types.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -96,7 +96,7 @@ class ODefinitionContainer
 {
 protected:
     typedef std::map< OUString, ::com::sun::star::uno::WeakReference< ::com::sun::star::ucb::XContent > > Documents;
-    DECLARE_STL_VECTOR(Documents::iterator, DocumentsIndexAccess);
+    typedef std::vector<Documents::iterator> DocumentsIndexAccess;
 
     enum ContainerOperation
     {
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index fd32e6a2b0fc..eb6db2aa42e7 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -20,17 +20,20 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX
 #define INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <cppuhelper/component.hxx>
 #include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/diagnose.h>
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 
 // various typedefs
 namespace {
-DECLARE_STL_VECTOR(::com::sun::star::uno::WeakReferenceHelper, OWeakRefArray);
+typedef std::vector<css::uno::WeakReferenceHelper> OWeakRefArray;
 }
 
 // OSubComponent - a component which holds a hard ref to it's parent
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index a2106c22b681..706fa32c95ce 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX
 #define INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX
 
-#include <comphelper/stl_types.hxx>
+#include <sal/config.h>
+
+#include <vector>
+
 #include "dbadllapi.hxx"
 #include <connectivity/DriversConfig.hxx>
 
@@ -97,7 +100,7 @@ enum DATASOURCE_TYPE
 class OOO_DLLPUBLIC_DBA ODsnTypeCollection
 {
 protected:
-    DECLARE_STL_VECTOR(OUString, StringVector);
+    typedef std::vector<OUString> StringVector;
 
     StringVector    m_aDsnTypesDisplayNames;    /// user readable names for the datasource types
     StringVector    m_aDsnPrefixes;             /// DSN prefixes which determine the type of a datasource
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 07ec8087c0e8..3ac25d013503 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -504,8 +504,8 @@ void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature,
         // we are notifying them, so we must use a copy of m_arrStatusListener, not
         // m_arrStatusListener itself
         Dispatch aNotifyLoop( m_arrStatusListener );
-        DispatchIterator iterSearch = aNotifyLoop.begin();
-        DispatchIterator iterEnd = aNotifyLoop.end();
+        Dispatch::iterator iterSearch = aNotifyLoop.begin();
+        Dispatch::iterator iterEnd = aNotifyLoop.end();
 
         while (iterSearch != iterEnd)
         {
@@ -748,7 +748,7 @@ void OGenericUnoController::addStatusListener(const Reference< XStatusListener >
 
 void OGenericUnoController::removeStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) throw(RuntimeException)
 {
-    DispatchIterator iterSearch = m_arrStatusListener.begin();
+    Dispatch::iterator iterSearch = m_arrStatusListener.begin();
 
     sal_Bool bRemoveForAll = _rURL.Complete.isEmpty();
     while ( iterSearch != m_arrStatusListener.end() )
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 165cb8b935b2..f9c264b00806 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -62,9 +62,9 @@ namespace dbaui
         if (_rLHS.size() != _rRHS.size())
             return sal_False;
 
-        ConstIndexFieldsIterator aLeft = _rLHS.begin();
-        ConstIndexFieldsIterator aLeftEnd = _rLHS.end();
-        ConstIndexFieldsIterator aRight = _rRHS.begin();
+        IndexFields::const_iterator aLeft = _rLHS.begin();
+        IndexFields::const_iterator aLeftEnd = _rLHS.end();
+        IndexFields::const_iterator aRight = _rRHS.begin();
         for (; aLeft != aLeftEnd; ++aLeft, ++aRight)
         {
             if (*aLeft != *aRight)
@@ -669,7 +669,7 @@ DBG_NAME(DbaIndexDialog)
         return sal_True;
     }
 
-    sal_Bool DbaIndexDialog::implCheckPlausibility(const ConstIndexesIterator& _rPos)
+    sal_Bool DbaIndexDialog::implCheckPlausibility(const Indexes::const_iterator& _rPos)
     {
         // need at least one field
         if (0 == _rPos->aFields.size())
@@ -682,7 +682,7 @@ DBG_NAME(DbaIndexDialog)
 
         // no double fields
         std::set< OUString > aExistentFields;
-        for (   ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin();
+        for (   IndexFields::const_iterator aFieldCheck = _rPos->aFields.begin();
                 aFieldCheck != _rPos->aFields.end();
                 ++aFieldCheck
             )
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 94631f69548d..e697807c394b 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -181,9 +181,9 @@ DBG_NAME(IndexFieldsControl)
     {
         // do not just copy the array, we may have empty field names (which should not be copied)
         _rFields.resize(m_aFields.size());
-        ConstIndexFieldsIterator aSource = m_aFields.begin();
-        ConstIndexFieldsIterator aSourceEnd = m_aFields.end();
-        IndexFieldsIterator aDest = _rFields.begin();
+        IndexFields::const_iterator aSource = m_aFields.begin();
+        IndexFields::const_iterator aSourceEnd = m_aFields.end();
+        IndexFields::iterator aDest = _rFields.begin();
         for (; aSource < aSourceEnd; ++aSource)
             if (!aSource->sFieldName.isEmpty())
             {
@@ -263,7 +263,7 @@ DBG_NAME(IndexFieldsControl)
         if (!IsEnabled())
             return NULL;
 
-        ConstIndexFieldsIterator aRow;
+        IndexFields::const_iterator aRow;
         sal_Bool bNewField = !implGetFieldDesc(_nRow, aRow);
 
         DbaMouseDownListBoxController* pReturn = NULL;
@@ -288,7 +288,7 @@ DBG_NAME(IndexFieldsControl)
         return pReturn;
     }
 
-    sal_Bool IndexFieldsControl::implGetFieldDesc(long _nRow, ConstIndexFieldsIterator& _rPos)
+    sal_Bool IndexFieldsControl::implGetFieldDesc(long _nRow, IndexFields::const_iterator& _rPos)
     {
         _rPos = m_aFields.end();
         if ((_nRow < 0) || (_nRow >= (sal_Int32)m_aFields.size()))
@@ -331,7 +331,7 @@ DBG_NAME(IndexFieldsControl)
                     if (nRow >= 0)  // may be -1 in case the control was empty
                     {
                         // remove the field from the selection
-                        IndexFieldsIterator aPos = m_aFields.begin() + nRow;
+                        IndexFields::iterator aPos = m_aFields.begin() + nRow;
 
                         if (bEmptySelected)
                         {
@@ -373,7 +373,7 @@ DBG_NAME(IndexFieldsControl)
 
     void IndexFieldsControl::InitController(CellControllerRef& /*_rController*/, long _nRow, sal_uInt16 _nColumnId)
     {
-        ConstIndexFieldsIterator aFieldDescription;
+        IndexFields::const_iterator aFieldDescription;
         sal_Bool bNewField = !implGetFieldDesc(_nRow, aFieldDescription);
 
         switch (_nColumnId)
@@ -430,7 +430,7 @@ DBG_NAME(IndexFieldsControl)
     }
     OUString IndexFieldsControl::GetCellText(long _nRow,sal_uInt16 nColId) const
     {
-        ConstIndexFieldsIterator aRow = m_aFields.end();
+        IndexFields::const_iterator aRow = m_aFields.end();
         if ( _nRow >= 0 )
         {
             aRow = m_aFields.begin() + _nRow;
@@ -438,7 +438,7 @@ DBG_NAME(IndexFieldsControl)
         }
         return GetRowCellText(aRow,nColId);
     }
-    OUString IndexFieldsControl::GetRowCellText(const ConstIndexFieldsIterator& _rRow,sal_uInt16 nColId) const
+    OUString IndexFieldsControl::GetRowCellText(const IndexFields::const_iterator& _rRow,sal_uInt16 nColId) const
     {
         if (_rRow < m_aFields.end())
         {
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 598b25f0f5d1..8849d60f3ee4 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -336,7 +336,7 @@ DBG_NAME(OParameterDialog)
         m_aVisitedParams[m_nCurrentlySelected] |= EF_VISITED;
 
         // was it the last "not visited yet" entry ?
-        ConstByteVectorIterator aIter;
+        ByteVector::const_iterator aIter;
         for (   aIter = m_aVisitedParams.begin();
                 aIter < m_aVisitedParams.end();
                 ++aIter
diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx
index e87ef1317643..c63dbe6a27c4 100644
--- a/dbaccess/source/ui/inc/commontypes.hxx
+++ b/dbaccess/source/ui/inc/commontypes.hxx
@@ -23,8 +23,8 @@
 #include <sal/config.h>
 
 #include <set>
+#include <vector>
 
-#include <comphelper/stl_types.hxx>
 #include <unotools/sharedunocomponent.hxx>
 
 namespace com { namespace sun { namespace star {
@@ -37,8 +37,8 @@ namespace dbaui
 {
 
     typedef std::set<OUString> StringBag;
-    DECLARE_STL_VECTOR( sal_Int8, ByteVector );
-    DECLARE_STL_VECTOR( OUString, StringArray );
+    typedef std::vector<sal_Int8> ByteVector;
+    typedef std::vector<OUString> StringArray;
 
     typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection;
 
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 7c8f8fde197b..cbacdfc76acf 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -154,7 +154,7 @@ namespace dbaui
 
         sal_Bool implDropIndex(SvTreeListEntry* _pEntry, sal_Bool _bRemoveFromCollection);
 
-        sal_Bool implCheckPlausibility(const ConstIndexesIterator& _rPos);
+        sal_Bool implCheckPlausibility(const Indexes::const_iterator& _rPos);
 
         /** checks if the controls have to be replaced and moved.
         */
diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx
index 398653bf8adb..94ba07bca84c 100644
--- a/dbaccess/source/ui/inc/indexes.hxx
+++ b/dbaccess/source/ui/inc/indexes.hxx
@@ -20,7 +20,9 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXES_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXES_HXX
 
-#include <comphelper/stl_types.hxx>
+#include <sal/config.h>
+
+#include <vector>
 
 namespace dbaui
 {
@@ -33,7 +35,7 @@ namespace dbaui
         OIndexField() : bSortAscending(sal_True) { }
     };
 
-    DECLARE_STL_VECTOR( OIndexField, IndexFields );
+    typedef std::vector<OIndexField> IndexFields;
 
     // OIndex
     struct GrantIndexAccess
@@ -76,7 +78,7 @@ namespace dbaui
         OIndex();   // not implemented
     };
 
-    DECLARE_STL_VECTOR( OIndex, Indexes );
+    typedef std::vector<OIndex> Indexes;
 
 }   // namespace dbaui
 
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 2d5fb7101f5a..cbad3b8dd248 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -36,7 +36,7 @@ namespace dbaui
         IndexFields                 m_aSavedValue;
 
         IndexFields                 m_aFields;          // !! order matters !!
-        ConstIndexFieldsIterator    m_aSeekRow;         // !!
+        IndexFields::const_iterator m_aSeekRow;         // !!
 
         Link                        m_aModifyHdl;
 
@@ -79,8 +79,8 @@ namespace dbaui
         void                InitController(::svt::CellControllerRef&, long _nRow, sal_uInt16 _nColumnId);
 
     protected:
-        OUString GetRowCellText(const ConstIndexFieldsIterator& _rRow,sal_uInt16 nColId) const;
-        sal_Bool implGetFieldDesc(long _nRow, ConstIndexFieldsIterator& _rPos);
+        OUString GetRowCellText(const IndexFields::const_iterator& _rRow,sal_uInt16 nColId) const;
+        sal_Bool implGetFieldDesc(long _nRow, IndexFields::const_iterator& _rPos);
 
         sal_Bool isNewField() const { return GetCurRow() >= (sal_Int32)m_aFields.size(); }
 
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx
index 977d5e3ab5f6..ddc12ca4ce22 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -158,7 +158,7 @@ namespace dbaui
             xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName));
 
             // the fields
-            for (   ConstIndexFieldsIterator aFieldLoop = _rPos->aFields.begin();
+            for (   IndexFields::const_iterator aFieldLoop = _rPos->aFields.begin();
                     aFieldLoop != _rPos->aFields.end();
                     ++aFieldLoop
                 )
diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx
index 1b409b3a98a6..4ac0eb28e810 100644
--- a/extensions/source/dbpilots/dbptypes.hxx
+++ b/extensions/source/dbpilots/dbptypes.hxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <set>
+#include <vector>
 
 #include <comphelper/stl_types.hxx>
 
@@ -31,7 +32,7 @@ namespace dbp
 {
 //.........................................................................
 
-    DECLARE_STL_VECTOR( OUString, StringArray );
+    typedef std::vector<OUString> StringArray;
     typedef std::set<OUString> StringBag;
     DECLARE_STL_STDKEY_MAP( sal_uInt32, OUString, MapInt2String );
 
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 7c3ec932edf5..6df275e9d775 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -367,7 +367,7 @@ namespace dbp
 
         // fill the listbox
         m_aDefSelection.Clear();
-        for (   ConstStringArrayIterator aLoop = rSettings.aLabels.begin();
+        for (   StringArray::const_iterator aLoop = rSettings.aLabels.begin();
                 aLoop != rSettings.aLabels.end();
                 ++aLoop
             )
@@ -452,7 +452,7 @@ namespace dbp
         // fill the list with all available options
         m_aOptions.Clear();
         m_nLastSelection = -1;
-        for (   ConstStringArrayIterator aLoop = rSettings.aLabels.begin();
+        for (   StringArray::const_iterator aLoop = rSettings.aLabels.begin();
                 aLoop != rSettings.aLabels.end();
                 ++aLoop
             )
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 724def0244bb..e72848531f9d 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -496,7 +496,7 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XContro
     OUString aName;
     OUString aValue;
 
-    for (   HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
+    for (   HtmlSuccessfulObjList::iterator pSuccObj = aSuccObjList.begin();
             pSuccObj < aSuccObjList.end();
             ++pSuccObj
         )
@@ -557,7 +557,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr
 
 
     // Aggregate Liste to OUString
-    for (   HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
+    for (   HtmlSuccessfulObjList::iterator pSuccObj = aSuccObjList.begin();
             pSuccObj < aSuccObjList.end();
             ++pSuccObj
         )
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index cbd685c3e416..934c9ef490b1 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include "propertybaghelper.hxx"
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/sdb/XSQLErrorListener.hpp>
@@ -111,8 +115,7 @@ public:
     }
 };
 
-
-DECLARE_STL_VECTOR(HtmlSuccessfulObj, HtmlSuccessfulObjList);
+typedef std::vector<HtmlSuccessfulObj> HtmlSuccessfulObjList;
 
 //========================================================================
 class OGroupManager;
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 0d34521a8a6b..b17c47ca55f1 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -29,7 +33,6 @@
 
 #include <osl/conditn.hxx>
 #include <cppuhelper/component.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/uno3.hxx>
 using namespace comphelper;
 
@@ -47,9 +50,9 @@ class OComponentEventThread
             ,public ::com::sun::star::lang::XEventListener
             ,public ::cppu::OWeakObject
 {
-    DECLARE_STL_VECTOR(::com::sun::star::lang::EventObject*, ThreadEvents);
-    DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter> , ThreadObjects);
-    DECLARE_STL_VECTOR(sal_Bool,    ThreadBools);
+    typedef std::vector<css::lang::EventObject*> ThreadEvents;
+    typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter> > ThreadObjects;
+    typedef std::vector<sal_Bool> ThreadBools;
 
     ::osl::Mutex                    m_aMutex;
     ::osl::Condition                m_aCond;            // Queue filled?
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 926c0cf34e79..19b6abb1640c 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -246,7 +246,7 @@ Sequence< Reference<XControlModel>  > OGroup::GetControlModels() const
     Sequence<Reference<XControlModel> > aControlModelSeq( nLen );
     Reference<XControlModel>* pModels = aControlModelSeq.getArray();
 
-    ConstOGroupCompArrIterator aGroupComps = m_aCompArray.begin();
+    OGroupCompArr::const_iterator aGroupComps = m_aCompArray.begin();
     for (sal_Int32 i = 0; i < nLen; ++i, ++pModels, ++aGroupComps)
     {
         *pModels = aGroupComps->GetControlModel();
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 05f0936c2c69..c0b40094f98e 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -27,11 +27,11 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/types.hxx>
 
 #include <algorithm>
 #include <map>
+#include <vector>
 
 using namespace comphelper;
 
@@ -120,7 +120,7 @@ public:
     OUString GetName() const { return m_aName; }
 };
 
-DECLARE_STL_VECTOR(OGroupComp, OGroupCompArr);
+typedef std::vector<OGroupComp> OGroupCompArr;
 
 //========================================================================
 class OGroupComp;
@@ -141,7 +141,7 @@ public:
     const OGroupComp&   GetGroupComponent() const { return m_aGroupComp; }
 };
 
-DECLARE_STL_VECTOR(OGroupCompAcc, OGroupCompAccArr);
+typedef std::vector<OGroupCompAcc> OGroupCompAccArr;
 
 //========================================================================
 class OGroup
@@ -174,7 +174,7 @@ public:
 };
 
 typedef std::map<OUString, OGroup> OGroupArr;
-DECLARE_STL_VECTOR(OGroupArr::iterator, OActiveGroups);
+typedef std::vector<OGroupArr::iterator> OActiveGroups;
 
 //========================================================================
 class OGroupManager : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener>
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 8bf420c4d3d0..93e62e0d7714 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FORMS_SOURCE_INC_PROPERTY_HXX
 #define INCLUDED_FORMS_SOURCE_INC_PROPERTY_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/uno/XAggregation.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -27,7 +31,6 @@
 #include <cppuhelper/proptypehlp.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/propagg.hxx>
-#include <comphelper/stl_types.hxx>
 
 using namespace comphelper;
 
@@ -61,7 +64,7 @@ class PropertyInfoService
 
     };
 
-    DECLARE_STL_VECTOR(PropertyAssignment, PropertyMap);
+    typedef std::vector<PropertyAssignment> PropertyMap;
     static PropertyMap      s_AllKnownProperties;
 
     //..................................................................
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index 63da1d549fb9..476c16425c5f 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -42,7 +42,7 @@ sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName)
 
     PropertyAssignment aCompareName(_rName, -1);
 
-    ::std::pair<PropertyMapIterator,PropertyMapIterator> aPair = ::std::equal_range(
+    ::std::pair<PropertyMap::iterator,PropertyMap::iterator> aPair = ::std::equal_range(
         s_AllKnownProperties.begin(),
         s_AllKnownProperties.end(),
         aCompareName,
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 9223be9e5078..3795ffb82f27 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/config.h>
 
-#include <vector>
 #include <map>
 
 #include <stack>
@@ -246,10 +245,6 @@ OutputIter intersperse(
 #define DECLARE_STL_STDKEY_MAP(keytype, valuetype, classname)               \
     DECLARE_STL_MAP(keytype, valuetype, std::less< keytype >, classname)    \
 
-#define DECLARE_STL_VECTOR(valuetyp, classname)     \
-    typedef std::vector< valuetyp >     classname;  \
-    DECLARE_STL_ITERATORS(classname)                \
-
 #endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index 682c04b8b49c..3e86a2a1fd85 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_DBACCESS_GENERICCONTROLLER_HXX
 #define INCLUDED_DBACCESS_GENERICCONTROLLER_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <dbaccess/AsyncronousLink.hxx>
 #include <dbaccess/controllerframe.hxx>
 #include <dbaccess/dbaccessdllapi.h>
@@ -226,7 +230,7 @@ namespace dbaui
         };
 
         DECLARE_STL_MAP( sal_uInt16, FeatureState, ::std::less< sal_uInt16 >, StateCache );
-        DECLARE_STL_VECTOR( DispatchTarget, Dispatch);
+        typedef std::vector<DispatchTarget> Dispatch;
 
         FeatureListeners        m_aFeaturesToInvalidate;
 
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index b1f26b684e73..f435ad5c8c92 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/charclass.hxx>
@@ -37,6 +36,7 @@
 #include <osl/thread.hxx>
 
 #include <deque>
+#include <vector>
 
 /**
  * class FmSearchThread
@@ -158,7 +158,7 @@ namespace svxform {
 
 enum FMSEARCH_MODE { SM_BRUTE, SM_ALLOWSCHEDULE, SM_USETHREAD };
 
-DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>, InterfaceArray);
+typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > InterfaceArray;
 
 class SVX_DLLPUBLIC FmSearchEngine
 {
@@ -187,11 +187,11 @@ class SVX_DLLPUBLIC FmSearchEngine
         sal_Bool                bDoubleHandling;
     };
 
-    DECLARE_STL_VECTOR(FieldInfo, FieldCollection);
+    typedef std::vector<FieldInfo> FieldCollection;
     FieldCollection             m_arrUsedFields;
     sal_Int32                   m_nCurrentFieldIndex;   // the last parameter of RebuildUsedFields, it allows checks in FormatField
 
-    DECLARE_STL_VECTOR(svxform::ControlTextWrapper*, ControlTextSuppliers);
+    typedef std::vector<svxform::ControlTextWrapper*> ControlTextSuppliers;
     ControlTextSuppliers    m_aControlTexts;
 
     sal_Bool                m_bUsingTextComponents;
@@ -200,7 +200,7 @@ class SVX_DLLPUBLIC FmSearchEngine
 
     // Data for the decision in which field a "Found" is accepted
     ::com::sun::star::uno::Any  m_aPreviousLocBookmark;     // position of the last finding
-    FieldCollectionIterator     m_iterPreviousLocField;     // field of the last finding
+    FieldCollection::iterator     m_iterPreviousLocField;     // field of the last finding
 
     // Communication with the thread that does the actual searching
     OUString            m_strSearchExpression;              // forward direction
@@ -354,12 +354,12 @@ private:
     // three methods implementing a complete search loop (null/not null, wildcard, SearchText)
     // (they all have some code in common, but with this solution we have do do a distinction only once per search (before
     // starting the loop), not in every loop step
-    SVX_DLLPRIVATE SEARCH_RESULT SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop,
-        const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
-    SVX_DLLPRIVATE SEARCH_RESULT SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop,
-        const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
-    SVX_DLLPRIVATE SEARCH_RESULT SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop,
-        const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
+    SVX_DLLPRIVATE SEARCH_RESULT SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop,
+        const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
+    SVX_DLLPRIVATE SEARCH_RESULT SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop,
+        const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
+    SVX_DLLPRIVATE SEARCH_RESULT SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop,
+        const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
 
     SVX_DLLPRIVATE void PropagateProgress(sal_Bool _bDontPropagateOverflow);
     // call the ProgressHandler with STATE_PROGRESS and the current position of the search iterator
@@ -367,7 +367,7 @@ private:
     // helpers, that are needed several times
     SVX_DLLPRIVATE sal_Bool MoveCursor();
     // moves m_xSearchIterator with respect to direction/overflow cursor
-    SVX_DLLPRIVATE sal_Bool MoveField(sal_Int32& nPos, FieldCollectionIterator& iter, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
+    SVX_DLLPRIVATE sal_Bool MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
     // moves the iterator with respect to the direction/overflow iterator/overflow cursor
     SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xAllFields, sal_Int32 nField);
     // builds a FieldInfo in relation to field number nField (in xAllFields) and adds it to m_arrUsedFields
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 3d6a54cffab4..cd81bf31d08b 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -270,7 +270,7 @@ sal_Bool FmSearchEngine::MoveCursor()
 }
 
 //------------------------------------------------------------------------
-sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollectionIterator& iter, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     sal_Bool bSuccess(sal_True);
     if (m_bForward)
@@ -399,13 +399,13 @@ OUString FmSearchEngine::FormatField(sal_Int32 nWhich)
 
 //------------------------------------------------------------------------
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos,
-    FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+    FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     // die Startposition merken
     Any aStartMark;
     try { aStartMark = m_xSearchCursor.getBookmark(); }
     catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; }
-    FieldCollectionIterator iterInitialField = iterFieldLoop;
+    FieldCollection::iterator iterInitialField = iterFieldLoop;
 
     // --------------------------------------------------------------
     sal_Bool bFound(sal_False);
@@ -464,13 +464,13 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor
 
 //------------------------------------------------------------------------
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos,
-    FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+    FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     // die Startposition merken
     Any aStartMark;
     try { aStartMark = m_xSearchCursor.getBookmark(); }
     catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; }
-    FieldCollectionIterator iterInitialField = iterFieldLoop;
+    FieldCollection::iterator iterInitialField = iterFieldLoop;
 
     WildCard aSearchExpression(strExpression);
 
@@ -542,7 +542,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& str
 
 //------------------------------------------------------------------------
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos,
-    FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+    FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     DBG_ASSERT(m_bLevenshtein || m_bRegular,
         "FmSearchEngine::SearchRegularApprox : ungueltiger Suchmodus !");
@@ -553,7 +553,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString
     Any aStartMark;
     try { aStartMark = m_xSearchCursor.getBookmark(); }
     catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; }
-    FieldCollectionIterator iterInitialField = iterFieldLoop;
+    FieldCollection::iterator iterInitialField = iterFieldLoop;
 
     // Parameter sammeln
     SearchOptions aParam;
@@ -782,7 +782,7 @@ sal_Bool FmSearchEngine::GetCaseSensitive() const
 //------------------------------------------------------------------------
 void FmSearchEngine::clearControlTexts()
 {
-    for (   ControlTextSuppliersIterator aIter = m_aControlTexts.begin();
+    for (   ControlTextSuppliers::iterator aIter = m_aControlTexts.begin();
             aIter < m_aControlTexts.end();
             ++aIter
         )
@@ -1014,9 +1014,9 @@ void FmSearchEngine::SearchNextImpl()
     }
 
     // fuer Arbeit auf Feldliste
-    FieldCollectionIterator iterBegin = m_arrUsedFields.begin();
-    FieldCollectionIterator iterEnd = m_arrUsedFields.end();
-    FieldCollectionIterator iterFieldCheck;
+    FieldCollection::iterator iterBegin = m_arrUsedFields.begin();
+    FieldCollection::iterator iterEnd = m_arrUsedFields.end();
+    FieldCollection::iterator iterFieldCheck;
 
     sal_Int32 nFieldPos;
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 972822aef10c..68a7a3638b5d 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -4219,7 +4219,7 @@ Reference< XDispatchProviderInterceptor >  FormController::createInterceptor(con
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 #ifdef DBG_UTIL
     // check if we already have a interceptor for the given object
-    for (   ConstInterceptorsIterator aIter = m_aControlDispatchInterceptors.begin();
+    for (   Interceptors::const_iterator aIter = m_aControlDispatchInterceptors.begin();
             aIter != m_aControlDispatchInterceptors.end();
             ++aIter
         )
@@ -4262,7 +4262,7 @@ void FormController::deleteInterceptor(const Reference< XDispatchProviderInterce
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     // search the interceptor responsible for the given object
-    InterceptorsIterator aIter;
+    Interceptors::iterator aIter;
     for (   aIter = m_aControlDispatchInterceptors.begin();
             aIter != m_aControlDispatchInterceptors.end();
             ++aIter
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index ff78efbb733e..2eb41e98b962 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -51,7 +51,6 @@
 #include "svx/fmsrccfg.hxx"
 #include <osl/mutex.hxx>
 #include <cppuhelper/component.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/container.hxx>
 #include <cppuhelper/compbase4.hxx>
 #include <cppuhelper/compbase6.hxx>
@@ -66,7 +65,7 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 
 typedef std::vector<SdrObject*> SdrObjArray;
-DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > ,FmFormArray);
+typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > > FmFormArray;
 
 // catch database exceptions if they occur
 #define DO_SAFE(statement) try { statement; } catch( const Exception& ) { OSL_FAIL("unhandled exception (I tried to move a cursor (or something like that).)"); }
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 61acc3448ba9..c74d7e537793 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX
 #define INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include "delayedevent.hxx"
 #include "formdispatchinterceptor.hxx"
 #include "sqlparserclient.hxx"
@@ -69,7 +73,6 @@
 
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <vcl/timer.hxx>
 
@@ -205,7 +208,7 @@ namespace svxform
 
         // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing
         // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class
-        DECLARE_STL_VECTOR(DispatchInterceptionMultiplexer*, Interceptors);
+        typedef std::vector<DispatchInterceptionMultiplexer*> Interceptors;
         Interceptors    m_aControlDispatchInterceptors;
 
     public:
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 4ec5810f24eb..53bc30b035d5 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -20,9 +20,9 @@
 #include <unotools/configvaluecontainer.hxx>
 #include <unotools/confignode.hxx>
 #include <tools/debug.hxx>
-#include <comphelper/stl_types.hxx>
 #include <uno/data.h>
 #include <algorithm>
+#include <vector>
 
 #ifdef DBG_UTIL
 #include <rtl/strbuf.hxx>
@@ -205,7 +205,7 @@ namespace utl
         }
     };
 
-    DECLARE_STL_VECTOR( NodeValueAccessor, NodeValueAccessors );
+    typedef std::vector<NodeValueAccessor> NodeValueAccessors;
 
     //=====================================================================
     //= OConfigurationValueContainerImpl
@@ -329,7 +329,7 @@ namespace utl
 
 #ifdef DBG_UTIL
         // another check (should be the first container for this node)
-        ConstNodeValueAccessorsIterator aExistent = ::std::find(
+        NodeValueAccessors::const_iterator aExistent = ::std::find(
             m_pImpl->aAccessors.begin(),
             m_pImpl->aAccessors.end(),
             _rAccessor
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index ffd38778d7c8..61b4257d4576 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -17,10 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <unotools/eventlisteneradapter.hxx>
 #include <osl/diagnose.h>
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/stl_types.hxx>
 
 //.........................................................................
 namespace utl
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
index 690345bedae0..d7fb7439e378 100644
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ b/xmloff/source/forms/attriblistmerge.cxx
@@ -36,7 +36,7 @@ namespace xmloff
     sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
     {
         sal_Int16 nLeftOver = _nGlobalIndex;
-        ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin();
+        AttributeListArray::const_iterator aLookupSublist = m_aLists.begin();
 
         for ( ; (aLookupSublist != m_aLists.end()) && (nLeftOver >= (*aLookupSublist)->getLength());
                 ++aLookupSublist
@@ -55,7 +55,7 @@ namespace xmloff
 
     sal_Bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
     {
-        for (   ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin();
+        for (   AttributeListArray::const_iterator aLookupSublist = m_aLists.begin();
                 aLookupSublist != m_aLists.end();
                 ++aLookupSublist
             )
@@ -74,7 +74,7 @@ namespace xmloff
     sal_Int16 SAL_CALL OAttribListMerger::getLength(  ) throw(RuntimeException)
     {
         sal_Int16 nCount = 0;
-        for (   ConstAttributeListArrayIterator aAccumulate = m_aLists.begin();
+        for (   AttributeListArray::const_iterator aAccumulate = m_aLists.begin();
                 aAccumulate != m_aLists.end();
                 ++aAccumulate
             )
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
index 6628d9b9f835..b18d03176482 100644
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX
 
-#include <comphelper/stl_types.hxx>
+#include <sal/config.h>
+
+#include <vector>
+
 #include <cppuhelper/implbase1.hxx>
 #include <osl/mutex.hxx>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
@@ -39,7 +42,7 @@ namespace xmloff
     {
     protected:
         ::osl::Mutex        m_aMutex;
-        DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >, AttributeListArray );
+        typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > > AttributeListArray;
         AttributeListArray  m_aLists;
 
         ~OAttribListMerger() { }