Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

89 files changed, 218 insertions, 265 deletions

diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
index bce450f9c96f..359fc0fa5e15 100644
--- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
@@ -21,7 +21,7 @@
 
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/groupprimitive2d.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index 7cf2311de719..13fb133ddfde 100644
--- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
@@ -23,7 +23,7 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 
 #include <drawinglayer/primitive2d/groupprimitive2d.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx
index e38086fc8d28..06d9068cc0ee 100644
--- a/include/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -24,7 +24,7 @@
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <vcl/font.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <vector>
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index c5c492e85800..7ec841e50134 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -20,8 +20,8 @@
 #ifndef _SVX_ACCESSIBLE_EDITABLE_TEXT_PARA_HXX
 #define _SVX_ACCESSIBLE_EDITABLE_TEXT_PARA_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/compbase9.hxx>
 #include <cppuhelper/typeprovider.hxx>
diff --git a/include/editeng/AccessibleStringWrap.hxx b/include/editeng/AccessibleStringWrap.hxx
index 3252d1533edb..1d0a9a811d09 100644
--- a/include/editeng/AccessibleStringWrap.hxx
+++ b/include/editeng/AccessibleStringWrap.hxx
@@ -20,10 +20,9 @@
 #ifndef _ACCESSIBLESTRINGWRAP_HXX
 #define _ACCESSIBLESTRINGWRAP_HXX
 
-#include <sal/types.h>
-#include <tools/string.hxx>
-
 #include <editeng/editengdllapi.h>
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
 
 class OutputDevice;
 class SvxFont;
diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx
index 6fc197fb1394..fef8807e07ec 100644
--- a/include/editeng/charsetcoloritem.hxx
+++ b/include/editeng/charsetcoloritem.hxx
@@ -19,9 +19,9 @@
 #ifndef _SVX_CSCOITEM_HXX
 #define _SVX_CSCOITEM_HXX
 
-#include <tools/string.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/editengdllapi.h>
+#include <rtl/ustring.hxx>
 
 // class SvxCharSetColorItem ---------------------------------------------
 
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 6ddf0e847175..0369c25e80b0 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -20,7 +20,7 @@
 #ifndef _EDITSTAT_HXX
 #define _EDITSTAT_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <i18nlangtag/lang.h>
 
 #define EE_CNTRL_USECHARATTRIBS     0x00000001  // Use of hard character attributes
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 8f9c7abcb35d..6f87e077ad08 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -19,8 +19,8 @@
 #ifndef _EDT_ABSTDLG_HXX
 #define _EDT_ABSTDLG_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <editeng/editengdllapi.h>
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index e083e86f72e8..0536c79ca33c 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -19,10 +19,10 @@
 #ifndef _SVX_FONTITEM_HXX
 #define _SVX_FONTITEM_HXX
 
+#include <editeng/editengdllapi.h>
+#include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
-#include <tools/string.hxx>
 #include <vcl/font.hxx>
-#include "editeng/editengdllapi.h"
 
 class SvXMLUnitConverter;
 
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 8a64415484a7..153a8fff9bc4 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -23,7 +23,7 @@
 #include <editeng/eerdll.hxx>
 
 // forward ---------------------------------------------------------------
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/resid.hxx>
 #include <tools/bigint.hxx>
 #include <svl/poolitem.hxx>
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 0ed0a841e1d8..d1a9c3412caa 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -19,8 +19,8 @@
 #ifndef _SVX_NUMITEM_HXX
 #define _SVX_NUMITEM_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/link.hxx>
-#include <tools/string.hxx>
 #include <svl/poolitem.hxx>
 #include <editeng/svxenum.hxx>
 #include <tools/gen.hxx>
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 3b3f18bfea72..b8f1236567d7 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -19,14 +19,12 @@
 #ifndef _OUTLINER_HXX
 #define _OUTLINER_HXX
 
-#include <tools/gen.hxx>
-#include <tools/string.hxx>
-
-#include <svl/brdcst.hxx>
-
 #include <editeng/editdata.hxx>
 #include <editeng/numitem.hxx>
 #include <i18nlangtag/lang.h>
+#include <rtl/ustring.hxx>
+#include <svl/brdcst.hxx>
+#include <tools/gen.hxx>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
 #include <vcl/graph.hxx>
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 8aa45c2157d2..64ffdd2df509 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -22,11 +22,11 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <tools/solar.h>
-#include <tools/string.hxx>
-#include <rsc/rscsfx.hxx>
 #include <editeng/paragraphdata.hxx>
-#include "editeng/editengdllapi.h"
+#include <editeng/editengdllapi.h>
+#include <rtl/ustring.hxx>
+#include <rsc/rscsfx.hxx>
+#include <tools/solar.h>
 
 class EditTextObject;
 class ImplOutlinerParaObject;
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 41d07530cabe..3a7855f69b1c 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -19,10 +19,10 @@
 #ifndef _SVX_SPLWRAP_HXX
 #define _SVX_SPLWRAP_HXX
 
+#include <editeng/editengdllapi.h>
 #include <editeng/svxenum.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include "editeng/editengdllapi.h"
 
 // forward ---------------------------------------------------------------
 
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 4a5a83a147e9..856c19439c7c 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -20,9 +20,9 @@
 #ifndef _SVXRTF_HXX
 #define _SVXRTF_HXX
 
-#include <tools/string.hxx>
 #include <svl/itemset.hxx>
 #include <svtools/parrtf.hxx>
+#include <rtl/ustring.hxx>
 
 #include <editeng/editengdllapi.h>
 
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 74e2163ac544..fecbb4a6d815 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -20,12 +20,10 @@
 #ifndef EE_SVXSWAFOPT_HXX
 #define EE_SVXSWAFOPT_HXX
 
+#include <editeng/editengdllapi.h>
 #include <o3tl/sorted_vector.hxx>
-
-#include <tools/string.hxx>
-
+#include <rtl/ustring.hxx>
 #include <vcl/font.hxx>
-#include "editeng/editengdllapi.h"
 
 class SmartTagMgr;
 
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 0a3b6912d9a3..215785a6b2d1 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -22,11 +22,11 @@
 
 #include <com/sun/star/accessibility/TextSegment.hpp>
 
-#include <tools/solar.h>
 #include <i18nlangtag/lang.h>
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
+#include <tools/solar.h>
 #include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/itempool.hxx>
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index a1c24c44d37e..c63f50239323 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -21,7 +21,7 @@
 #define _UNO_LINGU_HXX
 
 #include <i18nlangtag/lang.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <com/sun/star/util/Language.hpp>
 #include <com/sun/star/linguistic2/XLinguServiceManager2.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx
index d543ac33786b..dab61f82eb87 100644
--- a/include/filter/msfilter/rtfutil.hxx
+++ b/include/filter/msfilter/rtfutil.hxx
@@ -10,10 +10,11 @@
 #ifndef INCLUDED_MSFILTER_RTFUTIL_HXX
 #define INCLUDED_MSFILTER_RTFUTIL_HXX
 
-#include "filter/msfilter/msfilterdllapi.h"
+#include <filter/msfilter/msfilterdllapi.h>
 #include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
 #include <rtl/textenc.h>
-#include <tools/string.hxx>
+#include <tools/solar.h>
 
 namespace msfilter {
 namespace rtfutil {
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 4cba0ec06e30..0f5c6b32b1a2 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -20,8 +20,8 @@
 #ifndef _SVDFPPT_HXX
 #define _SVDFPPT_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
 #include <svx/svdobj.hxx>
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index c1e94da9a7a4..963ca1b568ca 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -20,10 +20,10 @@
 #ifndef FORMULA_COMPILER_HXX_INCLUDED
 #define FORMULA_COMPILER_HXX_INCLUDED
 
-#include "formula/formuladllapi.h"
-#include <tools/string.hxx>
-#include <tools/debug.hxx>
+#include <formula/formuladllapi.h>
 #include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/debug.hxx>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/unordered_map.hpp>
@@ -34,7 +34,7 @@
 #include "formula/grammar.hxx"
 #include "formula/token.hxx"
 #include "formula/ExternalReferenceHelper.hxx"
-
+#include <tools/string.hxx>
 
 #define FORMULA_MAXJUMPCOUNT    32  /* maximum number of jumps (ocChose) */
 #define FORMULA_MAXTOKENS     8192  /* maximum number of tokens in formula */
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index c5d3919366df..d8182a9d64cd 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -24,7 +24,7 @@
 #include <memory>
 #include "formula/formuladllapi.h"
 #include <rtl/ustring.hxx>
-#include <tools/string.hxx>
+#include <tools/solar.h>
 #include <com/sun/star/sheet/XFormulaParser.hpp>
 #include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
 
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index d7d60b55d43c..536521a0329e 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -20,9 +20,9 @@
 #ifndef FORMULA_FORMDATA_HXX
 #define FORMULA_FORMDATA_HXX
 
-#include <tools/string.hxx>
+#include <formula/formuladllapi.h>
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include "formula/formuladllapi.h"
 
 //============================================================================
 namespace formula
diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx
index c717dd4de34d..41095da99364 100644
--- a/include/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
@@ -20,11 +20,11 @@
 #ifndef FORMULA_FORMULA_HELPER_HXX
 #define FORMULA_FORMULA_HELPER_HXX
 
-#include "formula/IFunctionDescription.hxx"
+#include <formula/IFunctionDescription.hxx>
+#include <formula/formuladllapi.h>
+#include <rtl/ustring.hxx>
 #include <vector>
-#include <tools/string.hxx>
 #include <memory>
-#include "formula/formuladllapi.h"
 
 class SvtSysLocale;
 class CharClass;
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index da5c4dccec2e..546ab574f6a6 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -35,7 +35,7 @@
 #include <cppuhelper/implbase1.hxx> // helper for implementations
 #include <unotools/pathoptions.hxx>
 #include <i18nlangtag/lang.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <unotools/charclass.hxx>
 #include <osl/thread.h>
 #include <osl/mutex.hxx>
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index d9ab7f16fd79..917cc2ced113 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -35,14 +35,12 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <cppuhelper/weak.hxx>
+#include <rtl/ustring.hxx>
+#include <svl/lstner.hxx>
 #include <tools/link.hxx>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
-#include <svl/lstner.hxx>
-
-#include <cppuhelper/weak.hxx>
 #include <ucbhelper/content.hxx>
-
 #include <vector>
 
 class SvKeyValueIterator;
@@ -78,17 +76,6 @@ public:
                                    StreamMode nOpenMode,
                                    const SfxFilter *pFilter = 0,
                                    SfxItemSet *pSet = 0 );
-                        //TODO: the next, non-defined overload is only there to
-                        // detect uses of the above (String, StreamMode, etc.)
-                        // overload from when it still had an additional third
-                        // parameter sal_Bool bDirect, where now a leftover
-                        // "false" or "sal_False" could be mistaken for a null
-                        // pointer argument for the pFilter parameter; it can be
-                        // removed once we are confident all old uses of the
-                        // original overload have been adapted (in platform
-                        // specific code etc.):
-                        SfxMedium(String const &, StreamMode, void *)
-                            SAL_DELETED_FUNCTION;
 
                         /**
                          * @param pSet does NOT take ownership
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index bd2d41e92da8..2470155462e8 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -19,23 +19,22 @@
 #ifndef _SFX_DOCFILT_HACK_HXX
 #define _SFX_DOCFILT_HACK_HXX
 
-#include <sal/config.h>
-#include <sfx2/dllapi.h>
-#include <sal/types.h>
-#include <tools/solar.h>
-#include <tools/string.hxx>
 #include <com/sun/star/plugin/PluginDescription.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <comphelper/documentconstants.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
+#include <sfx2/sfxdefs.hxx>
+#include <tools/solar.h>
 #include <tools/wldcrd.hxx>
 
-#include <comphelper/documentconstants.hxx>
 #define SFX_FILTER_STARTPRESENTATION 0x20000000L
 
-#include <sfx2/sfxdefs.hxx>
-
 class SfxFilterContainer;
 class SotStorage;
 
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index beee0aff0138..414991d7728d 100644
--- a/include/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
@@ -20,13 +20,12 @@
 #ifndef _SFX_DOCINSERT_HXX
 #define _SFX_DOCINSERT_HXX
 
+#include <rtl/ustring.hxx>
+#include <sfx2/dllapi.h>
 #include <tools/errcode.hxx>
 #include <tools/link.hxx>
-#include <tools/string.hxx>
 #include <vector>
 
-#include "sfx2/dllapi.h"
-
 namespace sfx2 { class FileDialogHelper; }
 class SfxMedium;
 class SfxItemSet;
diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index f79a4b5f327b..cc3fc4e0ea74 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -19,11 +19,11 @@
 #ifndef _SFXDOCTEMPL_HXX
 #define _SFXDOCTEMPL_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
 #include <tools/ref.hxx>
-#include <tools/string.hxx>
 
 // CLASS -----------------------------------------------------------------
 
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index 67fbc847bceb..f178a40544cd 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -22,7 +22,6 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include "sfx2/sfx.hrc"
-#include <tools/string.hxx>
 #include <svl/hint.hxx>
 #include <unotools/eventcfg.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index b2944162c008..163eef9a1388 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <tools/errcode.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/edit.hxx>
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 7bff40381ee9..510f79bdd664 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -54,11 +54,12 @@ namespace com
         }
     }
 }
-#include <tools/ref.hxx>
-#include <tools/string.hxx>
+
+#include <comphelper/namedvaluecollection.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/brdcst.hxx>
 #include <svl/poolitem.hxx>
-#include <comphelper/namedvaluecollection.hxx>
+#include <tools/ref.hxx>
 #include <vector>
 
 class SvBorder;
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index dae89392d709..7837849f8768 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -19,14 +19,13 @@
 #ifndef _SFX_FRMDESCRHXX
 #define _SFX_FRMDESCRHXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <sfx2/sfxsids.hrc>
 #include <svl/poolitem.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/string.hxx>
 #include <tools/gen.hxx>
+#include <tools/urlobj.hxx>
 
 class SvStream;
 struct SfxFrameDescriptor_Impl;
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index f8ddc888d242..909a5ae09823 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -19,13 +19,12 @@
 #ifndef _LINKMGR_HXX
 #define _LINKMGR_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <sfx2/linksrc.hxx>
-#include <tools/string.hxx>
-
-#include <vector>
 #include <set>
+#include <vector>
 
 class SfxObjectShell;
 class Graphic;
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 5b8d1b1d8c2e..71ccb16b8888 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -20,12 +20,12 @@
 #define _LNKBASE_HXX
 
 #include <com/sun/star/io/XInputStream.hpp>
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
+#include <sfx2/linksrc.hxx>
 #include <sot/exchange.hxx>
 #include <tools/ref.hxx>
-#include <tools/string.hxx>
-#include <sfx2/linksrc.hxx>
 
 namespace com { namespace sun { namespace star { namespace uno
 {
diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index 87f3d09010e4..ff89a4d5cc0b 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_SFX_MAILMODEL_HXX
 #define INCLUDED_SFX_MAILMODEL_HXX
 
-#include <vector>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include "tools/link.hxx"
-#include <tools/string.hxx>
-#include "sfx2/dllapi.h"
+#include <rtl/ustring.hxx>
+#include <sfx2/dllapi.h>
+#include <tools/link.hxx>
+#include <vector>
 
 // class AddressList_Impl ------------------------------------------------
 typedef ::std::vector< OUString > AddressList_Impl;
diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx
index 1e70ae99cf2f..e324946c4164 100644
--- a/include/sfx2/mieclip.hxx
+++ b/include/sfx2/mieclip.hxx
@@ -20,11 +20,11 @@
 #ifndef _MIECLIP_HXX
 #define _MIECLIP_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 
 class SvStream;
 class SotDataObject;
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index f08bb68824e2..41780767474f 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -19,10 +19,11 @@
 #ifndef _SFX_MINFITEM_HXX
 #define _SFX_MINFITEM_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <svl/poolitem.hxx>
+
 class BasicManager;
 
 class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index c2b7d2b3e5ad..5fa53213e559 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
@@ -19,8 +19,12 @@
 #ifndef _SFXMNUITEM_HXX
 #define _SFXMNUITEM_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/ctrlitem.hxx>
+#include <sfx2/dllapi.h>
 
 class SfxVirtualMenu;
 class SfxBindings;
@@ -30,11 +34,6 @@ class PopupMenu;
 class SfxUnoMenuControl;
 class SfxUnoControllerItem;
 struct SfxMenuCtrlFactory;
-#include <tools/string.hxx>
-#include <sfx2/ctrlitem.hxx>
-
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/util/URL.hpp>
 
 class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
 {
diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx
index 891bcac0402b..9f0a4eb84c4e 100644
--- a/include/sfx2/msgpool.hxx
+++ b/include/sfx2/msgpool.hxx
@@ -19,13 +19,11 @@
 #ifndef _SFXMSGPOOL_HXX
 #define _SFXMSGPOOL_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
 #include <sfx2/msg.hxx>
-#include <tools/string.hxx>
-
 #include <string>
 #include <vector>
 
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 3a0a81b59d1f..f852a0009a6a 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -19,15 +19,12 @@
 #ifndef _SFXOBJFACE_HXX
 #define _SFXOBJFACE_HXX
 
-#include "sal/config.h"
-
-#include "rtl/ustring.hxx"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
-#include <tools/string.hxx>
-#include <tools/resid.hxx>
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
 #include <sfx2/msg.hxx>
+#include <tools/resid.hxx>
 
 struct SfxFormalArgument;
 struct SfxInterface_Impl;
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index a3e059bb3a62..b5455a8216ad 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -19,17 +19,15 @@
 #ifndef _SFX_SHELL_HXX
 #define _SFX_SHELL_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include "sal/types.h"
 #include <com/sun/star/embed/VerbDescriptor.hpp>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <sfx2/dllapi.h>
+#include <sfx2/sfxuno.hxx>
+#include <svl/brdcst.hxx>
 #include <tools/debug.hxx>
 #include <tools/rtti.hxx>
-#include <svl/brdcst.hxx>
-
-#include <tools/string.hxx>
-
-#include <sfx2/sfxuno.hxx>
 
 class ResMgr;
 class Window;
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index 67beb335833a..69915308004f 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -19,13 +19,12 @@
 #ifndef _SFX_STYFITEM_HXX
 #define _SFX_STYFITEM_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <vcl/bitmap.hxx>
 #include <vcl/image.hxx>
 #include <tools/rc.hxx>
-#include <tools/string.hxx>
 #include <rsc/rscsfx.hxx>
 #include <vector>
 
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index 93278038fec5..30fa06ea2dbe 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -19,12 +19,12 @@
 #ifndef _SFX_TPLPITEM_HXX
 #define _SFX_TPLPITEM_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <tools/string.hxx>
-#include <tools/rtti.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <svl/flagitem.hxx>
 #include <svl/style.hrc>
+#include <tools/rtti.hxx>
 
 class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
 {
diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx
index 7ff45729dad1..a4184c15dc2f 100644
--- a/include/sfx2/viewfac.hxx
+++ b/include/sfx2/viewfac.hxx
@@ -19,9 +19,9 @@
 #ifndef _VIEWFAC_HXX
 #define _VIEWFAC_HXX
 
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sfx2/dllapi.h>
 #include <tools/resid.hxx>
 
 class SfxViewFrame;
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 4fba3e33b213..4ce510ad133f 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -20,12 +20,11 @@
 #ifndef _SFXITEMPOOL_HXX
 #define _SFXITEMPOOL_HXX
 
-#include "svl/svldllapi.h"
-
 #include <limits.h>
-#include <tools/solar.h>
-#include <tools/string.hxx>
+#include <rtl/string.hxx>
 #include <svl/poolitem.hxx>
+#include <svl/svldllapi.h>
+#include <tools/solar.h>
 #include <vector>
 
 class SvStream;
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 85e006e7270f..c6c218aec46f 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -21,11 +21,11 @@
 
 // class SvxMacroItem ----------------------------------------------------
 
-#include "svl/svldllapi.h"
+#include <rtl/ustring.hxx>
+#include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
 #include <tools/rtti.hxx>
 #include <tools/debug.hxx>
-#include <tools/string.hxx>
 #include <map>
 
 class SvStream;
diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index fdedea036d00..5ed3fbf9838e 100644
--- a/include/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_NFKEYTAB_HXX
 
 #include <vector>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 //! For ImpSvNumberformatScan: first the short symbols, then the long symbols!
 //! e.g. first TT then TTTT
@@ -34,7 +34,7 @@
 // Note: 2005-09-02: the above applies to the binary file format.
 //
 // ER 15.12.99: This table is externally only to be used with method
-// String SvNumberformat::GetMappedFormatstring( const NfKeywordTable&, const LocaleDataWrapper& );
+// OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable&, const LocaleDataWrapper& );
 // and method
 // void SvNumberFormatter::FillKeywordTable( NfKeywordTable&, LanguageType );
 enum NfKeywordIndex
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index b16775fa9848..80820c51ee57 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -19,9 +19,9 @@
 #ifndef _UNDO_HXX
 #define _UNDO_HXX
 
-#include "svl/svldllapi.h"
+#include <svl/svldllapi.h>
+#include <rtl/ustring.hxx>
 #include <tools/rtti.hxx>
-#include <tools/string.hxx>
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx
index 672a9ec544a0..89d02cb70a29 100644
--- a/include/svl/urlbmk.hxx
+++ b/include/svl/urlbmk.hxx
@@ -20,8 +20,7 @@
 #ifndef _URLBMK_HXX
 #define _URLBMK_HXX
 
-
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 //=========================================================================
 
diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx
index e7d9ddc3ab91..34002b3d1701 100644
--- a/include/svx/ParseContext.hxx
+++ b/include/svx/ParseContext.hxx
@@ -19,12 +19,10 @@
 #ifndef SVX_QUERYDESIGNCONTEXT_HXX
 #define SVX_QUERYDESIGNCONTEXT_HXX
 
-#include "svx/svxdllapi.h"
 #include <connectivity/IParseContext.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
 #include <unotools/localedatawrapper.hxx>
-
-
 #include <vector>
 
 namespace svxform
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
index 98ddfc9441ec..9b5647657f77 100644
--- a/include/svx/XPropertyEntry.hxx
+++ b/include/svx/XPropertyEntry.hxx
@@ -19,8 +19,8 @@
 #ifndef _XPROPERTYENTRY_HXX
 #define _XPROPERTYENTRY_HXX
 
+#include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
-#include <tools/string.hxx>
 #include <vcl/bitmap.hxx>
 
 // ---------------------
diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index 5edd213026e7..ab9b8442c231 100644
--- a/include/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
@@ -21,16 +21,16 @@
 #define _FMSEARCH_HXX
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#include <vcl/dialog.hxx>
+#include <comphelper/stl_types.hxx>
+#include <comphelper/uno3.hxx>
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
 #include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/combobox.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace util {
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index e277f0533f64..be886bc95840 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -20,10 +20,10 @@
 #ifndef _SVX_GALLERY1_HXX_
 #define _SVX_GALLERY1_HXX_
 
-#include <tools/string.hxx>
-#include <tools/urlobj.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/brdcst.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
+#include <tools/urlobj.hxx>
 
 #include <cstdio>
 #include <vector>
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index c6e5ce414db8..70efc190c69e 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -19,11 +19,11 @@
 #ifndef _SVX_HLNKITEM_HXX
 #define _SVX_HLNKITEM_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svl/macitem.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 #define HYPERDLG_EVENT_MOUSEOVER_OBJECT     0x0001
 #define HYPERDLG_EVENT_MOUSECLICK_OBJECT    0x0002
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index ee96b09a42fc..3ee4a84af154 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -22,6 +22,7 @@
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <editeng/numitem.hxx>
+#include <tools/string.hxx>
 #include <vcl/font.hxx>
 
 namespace svx { namespace sidebar {
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 00fa70f9e19b..416112743f3b 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -20,7 +20,6 @@
 #define _SVX_PAGEITEM_HXX
 
 #include <svl/poolitem.hxx>
-#include <tools/string.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index eec572efb2f4..11adda2d06f1 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -20,12 +20,11 @@
 #ifndef _SVDETC_HXX
 #define _SVDETC_HXX
 
-#include <tools/string.hxx>
-
-#include <vcl/outdev.hxx>
-#include <tools/shl.hxx>
+#include <rtl/ustring.hxx>
 #include <editeng/outliner.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
+#include <tools/shl.hxx>
+#include <vcl/outdev.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/svx/svdglob.hxx b/include/svx/svdglob.hxx
index 655fd6093dd9..a028e9f5b65d 100644
--- a/include/svx/svdglob.hxx
+++ b/include/svx/svdglob.hxx
@@ -20,9 +20,8 @@
 #ifndef _SVDGLOB_HXX
 #define _SVDGLOB_HXX
 
+#include <rtl/ustring.hxx>
 #include <sal/config.h>
-#include <tools/string.hxx>
-
 #include <svx/svxdllapi.h>
 
 //************************************************************
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index faeae356b0e7..d6e2afb0c255 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -20,13 +20,13 @@
 #ifndef _SVDMARK_HXX
 #define _SVDMARK_HXX
 
-#include <vector>
-
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
 #include <svx/sdrobjectuser.hxx>
+#include <tools/solar.h>
 
 #include <set>
+#include <vector>
 
 class Rectangle;
 class SdrPage;
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index e3f4f28c3b9d..c8ed6c29dc4b 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -22,12 +22,12 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/weakref.hxx>
+#include <rtl/ustring.hxx>
 #include <sot/storage.hxx>
 #include <tools/link.hxx>
 #include <tools/weakbase.hxx>
 #include <vcl/mapmod.hxx>
 #include <svl/brdcst.hxx>
-#include <tools/string.hxx>
 #include <tools/datetime.hxx>
 #include <svl/hint.hxx>
 
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index b0c623206714..18660b70c6a1 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -22,24 +22,24 @@
 
 #include <memory>
 #include <typeinfo>
-#include <cppuhelper/weakref.hxx>
-#include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
-#include <tools/weakbase.hxx>
 #include <com/sun/star/uno/Any.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/lstner.hxx>
-#include <vcl/timer.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/svdsob.hxx>
 #include <svx/svdtypes.hxx> // fuer SdrLayerID
 #include <svx/svdglue.hxx> // Klebepunkte
 #include <svx/xdash.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/xenum.hxx>
-#include <vcl/bitmapex.hxx>
 #include <svx/sdrobjectuser.hxx>
-#include "svx/svxdllapi.h"
-#include "svx/shapeproperty.hxx"
-#include <svl/poolitem.hxx>
+#include <svx/svxdllapi.h>
+#include <svx/shapeproperty.hxx>
+#include <tools/weakbase.hxx>
+#include <vcl/bitmapex.hxx>
+#include <vcl/mapmod.hxx>
+#include <vcl/timer.hxx>
 
 #include <boost/optional.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 8b11872172c3..a3fba13c8b21 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -21,13 +21,13 @@
 #define _SVDPAGV_HXX
 
 #include <com/sun/star/awt/XControlContainer.hpp>
-#include <tools/string.hxx>
+#include <cppuhelper/implbase4.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/lstner.hxx>
 #include <svx/svdhlpln.hxx>
-#include <cppuhelper/implbase4.hxx>
 #include <svx/svdsob.hxx>
 #include <svx/svdtypes.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 #include <cppuhelper/implbase3.hxx>
 #include <vector>
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index c86fd0d35582..ad9698705ed8 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -20,15 +20,13 @@
 #ifndef _SVDTRANS_HXX
 #define _SVDTRANS_HXX
 
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
+#include <tools/fract.hxx>
 #include <tools/gen.hxx>
 #include <tools/poly.hxx>
-#include <tools/fract.hxx>
-
-#include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
-
 #include <vcl/field.hxx>
+#include <vcl/mapmod.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx
index 7b9b7f2bd4be..84ef1d244fba 100644
--- a/include/svx/swframeposstrings.hxx
+++ b/include/svx/swframeposstrings.hxx
@@ -19,8 +19,8 @@
 #ifndef _SVXSWFRAMEPOSSTRINGS_HXX
 #define _SVXSWFRAMEPOSSTRINGS_HXX
 
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
 
 /*
     contains strings needed for positioning dialogs
diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx
index 32dd1632db51..f69f7f4640fb 100644
--- a/include/svx/txenctab.hxx
+++ b/include/svx/txenctab.hxx
@@ -19,10 +19,10 @@
 #ifndef _SVX_TXENCTAB_HXX
 #define _SVX_TXENCTAB_HXX
 
-#include <tools/resary.hxx>
-#include <tools/string.hxx>
 #include <rtl/textenc.h>
-#include "svx/svxdllapi.h"
+#include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
+#include <tools/resary.hxx>
 
 
 //========================================================================
diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 23960e7fb8ea..466ee5d76ac3 100644
--- a/include/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
@@ -20,9 +20,9 @@
 #ifndef _SVX_XMLEXCHG_HXX_
 #define _SVX_XMLEXCHG_HXX_
 
+#include <rtl/ustring.hxx>
 #include <svtools/transfer.hxx>
-#include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 namespace com {
     namespace sun {
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 5d4463b96b17..baea5fb4cef7 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -20,6 +20,7 @@
 #define _XTABLE_HXX
 
 #include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/xdash.hxx>
 #include <svx/xhatch.hxx>
@@ -28,7 +29,6 @@
 #include <svx/xlnasit.hxx>
 
 #include <tools/color.hxx>
-#include <tools/string.hxx>
 #include <tools/contnr.hxx>
 
 #include <cppuhelper/weak.hxx>
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 435ca9bb9363..a8448e6bd49c 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -136,7 +136,6 @@ private:
     TOOLS_DLLPRIVATE UniString& Expand( xub_StrLen nCount, sal_Unicode cExpandChar );
     TOOLS_DLLPRIVATE sal_Bool   Equals( const sal_Unicode* pCharStr,
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
-    TOOLS_DLLPRIVATE sal_Bool   EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) const;
     TOOLS_DLLPRIVATE xub_StrLen Search( const sal_Unicode* pCharStr, xub_StrLen nIndex = 0 ) const;
 public:
                         UniString();
@@ -231,16 +230,10 @@ public:
                                         xub_StrLen nLen = STRING_LEN ) const;
     sal_Bool            Equals( const UniString& rStr ) const;
     sal_Bool            EqualsAscii( const sal_Char* pAsciiStr ) const;
-    sal_Bool            EqualsIgnoreCaseAscii( const UniString& rStr ) const;
-    sal_Bool            EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const;
     sal_Bool            Equals( const UniString& rStr,
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
     sal_Bool            EqualsAscii( const sal_Char* pAsciiStr,
                                      xub_StrLen nIndex, xub_StrLen nLen ) const;
-    sal_Bool            EqualsIgnoreCaseAscii( const UniString& rStr,
-                                               xub_StrLen nIndex, xub_StrLen nLen ) const;
-    sal_Bool            EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr,
-                                               xub_StrLen nIndex, xub_StrLen nLen ) const;
 
     xub_StrLen          Match( const UniString& rStr ) const;
 
diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx
index 076535e5feb6..6154c40c3a19 100644
--- a/include/vcl/FilterConfigItem.hxx
+++ b/include/vcl/FilterConfigItem.hxx
@@ -23,7 +23,7 @@
 
 #include <vcl/dllapi.h>
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Reference.h>
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index d6725202b6e1..62d29e679ce3 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -19,8 +19,8 @@
 #ifndef _VCL_ABSTDLG_HXX
 #define _VCL_ABSTDLG_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <vcl/dllapi.h>
 
 class Window;
diff --git a/include/vcl/controllayout.hxx b/include/vcl/controllayout.hxx
index b337ec730f88..84ce03146a0b 100644
--- a/include/vcl/controllayout.hxx
+++ b/include/vcl/controllayout.hxx
@@ -20,9 +20,9 @@
 #ifndef _VCL_CONTROLLAYOUT_HXX
 #define _VCL_CONTROLLAYOUT_HXX
 
-#include <vector>
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
+#include <vector>
 #include <vcl/dllapi.h>
 
 class Control;
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 77a277f17df8..d58bd5dde37d 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -21,6 +21,7 @@
 #define _SV_EDIT_HXX
 
 #include <tools/solar.h>
+#include <tools/string.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/timer.hxx>
 #include <vcl/ctrl.hxx>
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index cae3c1b839ed..1bf9e746f9c1 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -20,9 +20,9 @@
 #ifndef _SV_FONT_HXX
 #define _SV_FONT_HXX
 
+#include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <vcl/dllapi.h>
-#include <tools/string.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/color.hxx>
 #include <vcl/vclenum.hxx>
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 737229e0066b..a2e2034def15 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -20,11 +20,11 @@
 #ifndef _SV_GFXLINK_HXX
 #define _SV_GFXLINK_HXX
 
-#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <tools/stream.hxx>
 #include <tools/solar.h>
+#include <vcl/dllapi.h>
 #include <vcl/mapmod.hxx>
-#include <tools/string.hxx>
-#include <tools/stream.hxx>
 
 // -------------
 // - ImpBuffer -
diff --git a/include/vcl/graph.h b/include/vcl/graph.h
index e6f85432445a..713b303a9225 100644
--- a/include/vcl/graph.h
+++ b/include/vcl/graph.h
@@ -20,9 +20,9 @@
 #ifndef _SV_GRAPH_H
 #define _SV_GRAPH_H
 
-#include <vcl/dllapi.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
+#include <vcl/dllapi.h>
 
 // ---------------
 // - GraphicType -
diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx
index 0ae55a77c514..7fa35aba748d 100644
--- a/include/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
@@ -21,9 +21,9 @@
 #define _VCL_I18NHELP_HXX
 
 #include <com/sun/star/uno/Reference.h>
-#include <osl/mutex.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <tools/string.hxx>
+#include <osl/mutex.hxx>
+#include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
 
 namespace com {
diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 0e1747b956dc..7b31ff2e0363 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -20,10 +20,10 @@
 #ifndef _SV_KEYCODE_HXX
 #define _SV_KEYCODE_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <vcl/dllapi.h>
 #include <tools/resid.hxx>
+#include <vcl/dllapi.h>
 #include <vcl/keycodes.hxx>
 
 #include <vcl/vclenum.hxx>
diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index f6447254ed60..4d366434717e 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -20,10 +20,10 @@
 #ifndef _SV_MNEMONIC_HXX
 #define _SV_MNEMONIC_HXX
 
-#include <vcl/dllapi.h>
-#include <tools/string.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
 
 // ---------------------
 // - ImplMnemonicTypes -
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 0868da96120e..f39e080643b0 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -23,11 +23,10 @@
 #include <vector>
 #include <boost/unordered_map.hpp>
 
-#include "tools/string.hxx"
-#include "tools/stream.hxx"
-#include "rtl/string.hxx"
-
-#include "vcl/dllapi.h"
+#include <tools/stream.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
 
 #include "com/sun/star/lang/Locale.hpp"
 
diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index 1be7622cacbe..0a2c76c57687 100644
--- a/include/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
@@ -20,10 +20,8 @@
 #ifndef VCL_QUICKSELECTIONENGINE_HXX
 #define VCL_QUICKSELECTIONENGINE_HXX
 
-#include "dllapi.h"
-
-#include <tools/string.hxx>
-
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
 #include <memory>
 
 class KeyEvent;
diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx
index ab48231d23c2..6abd4b0ce6e6 100644
--- a/include/vcl/stdtext.hxx
+++ b/include/vcl/stdtext.hxx
@@ -20,7 +20,7 @@
 #ifndef _VCL_STDTEXT_HXX
 #define _VCL_STDTEXT_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 
diff --git a/include/vcl/strhelper.hxx b/include/vcl/strhelper.hxx
index 078f176fdec0..2b32e0dd6cdc 100644
--- a/include/vcl/strhelper.hxx
+++ b/include/vcl/strhelper.hxx
@@ -19,12 +19,10 @@
 #ifndef _PSPRINT_STRHELPER_HXX_
 #define _PSPRINT_STRHELPER_HXX_
 
-#include "vcl/dllapi.h"
-
-#include <tools/string.hxx>
-#include <rtl/math.hxx>
-
 #include <cstring>
+#include <rtl/math.hxx>
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
 
 namespace psp
 {
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 9a116d7750ea..ba2cf9e3e973 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -29,8 +29,8 @@
 #include <vector>
 
 #include <comphelper/solarmutex.hxx>
+#include <rtl/ustring.hxx>
 #include <osl/thread.hxx>
-#include <tools/string.hxx>
 #include <tools/link.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index bf3f4bf34a30..353fc21902ea 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -20,10 +20,10 @@
 #ifndef _TEXTDATA_HXX
 #define _TEXTDATA_HXX
 
-#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
 #include <svl/brdcst.hxx>
 #include <svl/smplhint.hxx>
-#include <tools/string.hxx>
+#include <vcl/dllapi.h>
 
 // for Notify, if all paragraphs were deleted
 #define TEXT_PARA_ALL               0xFFFFFFFF
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index f449670c3030..4b8b920e8147 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -45,11 +45,12 @@ namespace svl
 
 class TextLine;
 class TETextPortion;
+#include <rtl/ustring.hxx>
 #include <svl/brdcst.hxx>
+#include <tools/lineend.hxx>
 #include <tools/link.hxx>
-#include <vcl/font.hxx>
-#include <tools/string.hxx>
 #include <tools/gen.hxx>
+#include <vcl/font.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index e25b6381c9b2..984d264c1ded 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -20,10 +20,11 @@
 #ifndef _TEXTVIEW_HXX
 #define _TEXTVIEW_HXX
 
-#include <vcl/dllapi.h>
-#include <vcl/textdata.hxx>
 #include <tools/gen.hxx>
+#include <tools/lineend.hxx>
+#include <vcl/dllapi.h>
 #include <vcl/dndhelp.hxx>
+#include <vcl/textdata.hxx>
 
 class TextEngine;
 class OutputDevice;
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index 7245057a82df..18d2eb919d74 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -20,11 +20,11 @@
 #ifndef _TXTATTR_HXX
 #define _TXTATTR_HXX
 
-#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
 #include <tools/color.hxx>
-#include <vcl/vclenum.hxx>
-#include <tools/string.hxx>
 #include <tools/debug.hxx>
+#include <vcl/vclenum.hxx>
+#include <vcl/dllapi.h>
 
 class Font;
 
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 6d31e188a2d4..4b6c79be2e05 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <cppuhelper/weak.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
 
 namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {