Clean up includes of comphelper/stl_types.hxx

Change-Id: I00a8e794189d17ad91a90beb9ce6cb89b7bab2aa

61 files changed, 7 insertions, 63 deletions

diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index 31d7d798da1e..88842f0b333d 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <comphelper/stl_types.hxx>
 #include <map>
 
 
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index 7d1905555aa4..c94db66bb5ae 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -25,7 +25,6 @@
 #include <cppuhelper/implbase1.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
-#include <comphelper/stl_types.hxx>
 
 typedef std::map<OUString, ::com::sun::star::uno::Any> SvGenericNameContainerMapImpl;
 
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 5aa5e1a69cd9..b15dc92ca898 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -50,8 +50,6 @@ namespace dbtools
 {
 //.........................................................................
 
-
-    using namespace ::comphelper;
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::util;
     namespace utl = ::com::sun::star::util;
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index b6d578b27bc8..099a6176e952 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/types.hxx>
 #include "hsqldb/HStorageAccess.hxx"
 #include "hsqldb/HStorageMap.hxx"
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index 9a878d445a4c..9b677a0fd7f9 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/types.hxx>
 #include "hsqldb/HStorageAccess.hxx"
 #include "hsqldb/HStorageMap.hxx"
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index 2baea4ef02c4..70e9502a0d2d 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -24,7 +24,6 @@
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
-#include <comphelper/stl_types.hxx>
 #include <osl/thread.hxx>
 #include <connectivity/FValue.hxx>
 
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index 675f79a2222d..07ba910c373b 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -30,7 +30,6 @@
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
-#include <comphelper/stl_types.hxx>
 #include <osl/thread.hxx>
 
 #include <boost/unordered_map.hpp>
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 4c6219e7108f..d153932b1d78 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase5.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include "connectivity/CommonTools.hxx"
 
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index e818d3e87c28..759da1b1b50f 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -49,7 +49,6 @@
 #include "TConnection.hxx"
 #include <comphelper/numbers.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/stl_types.hxx>
 #include "connectivity/dbtools.hxx"
 #include "connectivity/dbmetadata.hxx"
 #include <tools/diagnose_ex.h>
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index fc42bb9ebb7d..f2cc52e9db3e 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -31,7 +31,6 @@
 #include <vcl/lstbox.hxx>
 #include <tools/link.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
 #include <rtl/ustring.hxx>
 
 namespace svxform {
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 6d3219d8b007..b74d31cd9b98 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CUI_SOURCE_INC_DBREGISTER_HXX
 #define INCLUDED_CUI_SOURCE_INC_DBREGISTER_HXX
 
-#include <comphelper/stl_types.hxx>
 #include <rtl/ustring.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <svl/poolitem.hxx>
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index 939985e6bb1c..3a0bc110ce9a 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "sdbcdriverenum.hxx"
-#include <comphelper/stl_types.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx
index 5a8356aaab2d..cbc5f2d5b756 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -28,7 +28,6 @@
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
-#include <comphelper/stl_types.hxx>
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index da438d7ab28c..88aaf2fd57ab 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -19,6 +19,7 @@
 
 #include <string.h>
 #include "ContentHelper.hxx"
+#include <rtl/ustrbuf.hxx>
 #include <ucbhelper/cancelcommandexecution.hxx>
 #include <comphelper/property.hxx>
 #include <com/sun/star/ucb/UnsupportedCommandException.hpp>
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index 9e9622785c3c..594aa92478be 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx
index 06586c56b929..f2379b2afad7 100644
--- a/dbaccess/source/core/inc/querycontainer.hxx
+++ b/dbaccess/source/core/inc/querycontainer.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCONTAINER_HXX
 
 #include <cppuhelper/implbase5.hxx>
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx
index 32fa409237b1..5c6810eb65e3 100644
--- a/dbaccess/source/core/inc/tablecontainer.hxx
+++ b/dbaccess/source/core/inc/tablecontainer.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLECONTAINER_HXX
 
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx
index b41caaaf1e78..73ec26f8e543 100644
--- a/dbaccess/source/core/inc/viewcontainer.hxx
+++ b/dbaccess/source/core/inc/viewcontainer.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_DBACCESS_SOURCE_CORE_INC_VIEWCONTAINER_HXX
 
 #include <cppuhelper/implbase1.hxx>
-#include <comphelper/stl_types.hxx>
 
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index dcd8b8c134b7..78553205e49b 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -55,7 +55,6 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/types.hxx>
 #include <cppuhelper/implbase2.hxx>
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 5fb954c55d94..5637bb2cc65c 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/ui/XContextMenuInterception.hpp>
 
-#include <comphelper/stl_types.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase5.hxx>
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 7095a9b338a2..dc659c5fae39 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -23,7 +23,6 @@
 #include "adminpages.hxx"
 #include <com/sun/star/i18n/XCollator.hpp>
 #include <osl/mutex.hxx>
-#include <comphelper/stl_types.hxx>
 #include <vcl/fixed.hxx>
 #include "tabletree.hxx"
 #include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index b762b8d255dd..dbd9f4eb1696 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROW_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROW_HXX
 
-#include <comphelper/stl_types.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "TypeInfo.hxx"
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index c252f3764d87..fa208ec42e60 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -25,7 +25,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
-#include <comphelper/stl_types.hxx>
 #include <deque>
 
 #include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 1622b465ccfa..3eb860996964 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -54,7 +54,6 @@
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/util/XCancellable.hpp>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase12.hxx>
 #include <cppuhelper/implbase10.hxx>
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 6751cbeafab1..afe67567249b 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -22,7 +22,6 @@
 
 #include "brwctrlr.hxx"
 #include <com/sun/star/sdbc/XConnection.hpp>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index 8ce999d98581..77f16ccf6d10 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -20,10 +20,9 @@
 #include "TableConnectionData.hxx"
 #include <tools/debug.hxx>
 #include <osl/diagnose.h>
-#include <comphelper/stl_types.hxx>
 
 using namespace dbaui;
-using namespace comphelper;
+
 // class OTableConnectionData
 DBG_NAME(OTableConnectionData)
 OTableConnectionData::OTableConnectionData()
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index 49eb6fa22667..93c4dade759a 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <com/sun/star/beans/NamedValue.hpp>
+
 #include "pcrunodialogs.hxx"
 #include "formstrings.hxx"
 #include "pcrstrings.hxx"
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index 7e1340059c2d..79f0e67a240e 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -24,7 +24,6 @@
 
 #include <com/sun/star/inspection/XPropertyControl.hpp>
 #include <vcl/tabctrl.hxx>
-#include <comphelper/stl_types.hxx>
 #include <boost/mem_fn.hpp>
 #include <map>
 
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index e72848531f9d..88f7e5ded170 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -62,7 +62,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/sequence.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx
index fb16be95d66b..525d40778f33 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.hxx
@@ -27,7 +27,6 @@
 #include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/diagnose.h>
-#include <comphelper/stl_types.hxx>
 #include <rtl/instance.hxx>
 #include <cppuhelper/propshlp.hxx>
 
diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index d3085a30591c..b957683c89a6 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_COMPHELPER_PROPARRHLP_HXX
 #define INCLUDED_COMPHELPER_PROPARRHLP_HXX
 
-#include <comphelper/stl_types.hxx>
 #include <comphelper/propagg.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <osl/mutex.hxx>
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index 754e2dc774e8..80512576b828 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -25,7 +25,6 @@
 #include <rtl/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <osl/diagnose.h>
-#include <comphelper/stl_types.hxx>
 #include <rtl/ref.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/CommonTools.hxx>
diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx
index a07d024904fa..f3ff3c7f25b8 100644
--- a/include/connectivity/dbcharset.hxx
+++ b/include/connectivity/dbcharset.hxx
@@ -25,7 +25,6 @@
 #include <cstddef>
 #include <set>
 
-#include <comphelper/stl_types.hxx>
 #include <rtl/textenc.h>
 #include <rtl/tencinfo.h>
 #include <rtl/ustring.hxx>
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index 3bf79bf21285..2b342d51d47b 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <connectivity/CommonTools.hxx>
diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx
index c511a41067db..2924f342d2ef 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -23,7 +23,6 @@
 #include <svtools/wizdlg.hxx>
 #include <vcl/button.hxx>
 #include <vcl/tabpage.hxx>
-#include <comphelper/stl_types.hxx>
 
 class Bitmap;
 //.........................................................................
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index e6fef351163f..5b535cb7c019 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_DBAEXCHANGE_HXX
 
 #include <svtools/transfer.hxx>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <svx/dataaccessdescriptor.hxx>
diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx
index 429477e7a825..d8058483b76d 100644
--- a/include/svx/dbaobjectex.hxx
+++ b/include/svx/dbaobjectex.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_DBAOBJECTEX_HXX
 
 #include <svtools/transfer.hxx>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index a45c03936bd1..ce5a91c4d9d4 100644
--- a/include/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_FMSEARCH_HXX
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/uno3.hxx>
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index 9cfbc4f72699..23493566a32d 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/IdPropArrayHelper.hxx>
-#include <comphelper/stl_types.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace lang {
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 9de4b13fb163..98fa37e79a8c 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -32,7 +32,6 @@
 #include <svx/svdocirc.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdoashp.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/implementationreference.hxx>
 
 
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index f6311191bab7..ab44b825c6e2 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/drawing/XShapeGrouper.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/form/XFormsSupplier2.hpp>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/implementationreference.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index a7e6d037b4b1..95cf7f3cc8d5 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -57,7 +57,6 @@
 #include <osl/file.hxx>
 #include <sfx2/docfile.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <com/sun/star/task/XJobExecutor.hpp>
 #include <vcl/msgbox.hxx>
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index d5f23258eff6..bf223184be30 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -42,7 +42,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <memory>
 
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 5b4212f4a3d8..db7fea27e703 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -28,7 +28,6 @@
 #include <vcl/waitobj.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/diagnose_ex.h>
-#include <comphelper/stl_types.hxx>
 #include "rptui_slotid.hrc"
 
 #include <connectivity/dbtools.hxx>
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index d0bd083cc181..9bf6818d57ad 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -32,7 +32,6 @@
 #include <vcl/timer.hxx>
 #include <svl/hint.hxx>
 #include <svl/brdcst.hxx>
-#include <comphelper/stl_types.hxx>
 #include "ReportDefines.hxx"
 #include <svtools/colorcfg.hxx>
 #include <boost/shared_ptr.hpp>
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index cfd7bcc66f70..ee4e02688d14 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -28,7 +28,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <comphelper/stl_types.hxx>
 #include <vcl/timer.hxx>
 
 #include <sddllapi.h>
diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx
index 9303a03c1ed9..4cc95e0ffca9 100644
--- a/sd/source/ui/animations/STLPropertySet.hxx
+++ b/sd/source/ui/animations/STLPropertySet.hxx
@@ -22,8 +22,6 @@
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-#include <comphelper/stl_types.hxx>
-
 #include <list>
 #include <map>
 
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 9ad7bf4a1bff..a4c08409ae82 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -21,9 +21,6 @@
 #include "framework/Configuration.hxx"
 
 #include "framework/FrameworkHelper.hxx"
-#include <comphelper/stl_types.hxx>
-
-
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 275f1ab04553..50c587adaa00 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 
-#include <comphelper/stl_types.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 8e68baf05ded..ff5bad215461 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -31,7 +31,6 @@
 #include <comphelper/anytostring.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/bootstrap.hxx>
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 135fcd7b677e..efa1e8c79696 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -44,7 +44,6 @@
 #include <cppuhelper/compbase4.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <comphelper/stl_types.hxx>
 
 namespace cssu = ::com::sun::star::uno;
 
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index d9cd76a98d0b..02dde6b27ab4 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svx/dataaccessdescriptor.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <osl/diagnose.h>
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 528a0fb15fd1..0022e9200988 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/diagnose_ex.h>
-#include <comphelper/stl_types.hxx>
 #include <svx/svdobj.hxx>
 #include "svx/fmtools.hxx"
 #include "fmservs.hxx"
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 78ebec695ac2..bd1b51017d11 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/util/XLocalizedAliases.hpp>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/stl_types.hxx>
 
 #include "fmhelp.hrc"
 #include <svx/fmshell.hxx>
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 927b3e6ba988..86cc18a14caf 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -23,7 +23,6 @@
 
 #include <set>
 
-#include <comphelper/stl_types.hxx>
 #include <svtools/transfer.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index f93a4cdf4b14..de9ffde993e3 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -34,7 +34,6 @@
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/servicenames.hxx>
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index a109eca84c0f..29ca7de9fdaa 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
-#include <comphelper/stl_types.hxx>
 
 #include <boost/unordered_map.hpp>
 #include "itemholder1.hxx"
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 8a2aba76d237..4900ca9dbb42 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -28,7 +28,6 @@
 #include <osl/diagnose.h>
 #include <comphelper/extract.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/stl_types.hxx>
 #include "officeforms.hxx"
 
 namespace xmloff
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index ce294c8a9144..8d81ca6d785e 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -25,7 +25,6 @@
 #include <set>
 
 #include "formattributes.hxx"
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <callbacks.hxx>
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index ee7b6a46802b..02f58e2cd5b5 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -27,7 +27,6 @@
 #include <xmloff/xmlictxt.hxx>
 #include "formattributes.hxx"
 #include <rtl/ref.hxx>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include "layerimport.hxx"
 
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index a703a997b43a..bddd6eb143d2 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -37,7 +37,6 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/PropertySetInfoHash.hxx>
-#include <comphelper/stl_types.hxx>
 
 using namespace ::std;
 using namespace ::com::sun::star;