drop unnecessary tools/string includes

Change-Id: I4278999b9b7d184c26036bbe9e3b98420f461e8c

54 files changed, 46 insertions, 74 deletions

diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx
index f4e766aeff53..c6ced05615d7 100644
--- a/sw/inc/IDocumentListItems.hxx
+++ b/sw/inc/IDocumentListItems.hxx
@@ -21,7 +21,7 @@
 #define IDOCUMENTLISTITEMS_HXX_INCLUDED
 
 #include <vector>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 class SwNodeNum;
 
 /** Provides numbered items of a document.
diff --git a/sw/inc/IDocumentListsAccess.hxx b/sw/inc/IDocumentListsAccess.hxx
index 1c072f73d524..4351d6fe28b1 100644
--- a/sw/inc/IDocumentListsAccess.hxx
+++ b/sw/inc/IDocumentListsAccess.hxx
@@ -20,7 +20,7 @@
 #ifndef IDOCUMENTLISTSACCESS_HXX_INCLUDED
 #define IDOCUMENTLISTSACCESS_HXX_INCLUDED
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 class SwList;
 
diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx
index 80a0fde55135..0fc0156f2a66 100644
--- a/sw/inc/IDocumentOutlineNodes.hxx
+++ b/sw/inc/IDocumentOutlineNodes.hxx
@@ -20,8 +20,8 @@
 #ifndef IDOCUMENTOUTLINENODES_HXX_INCLUDED
 #define IDOCUMENTOUTLINENODES_HXX_INCLUDED
 
+#include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <tools/string.hxx>
 #include <vector>
 class SwTxtNode;
 
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 9b6adc3a7377..47795c46340e 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -24,7 +24,7 @@
 
 #include <editeng/swafopt.hxx>
 #include <editeng/Trie.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 class SwDoc;
 class SwAutoCompleteWord_Impl;
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index fa3d0fffbe1c..d75420345b16 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -21,12 +21,8 @@
 #define SW_CALC_HXX
 
 #include <vector>
-
-#include <tools/string.hxx>
-#include <unotools/syslocale.hxx>
-
 #include <basic/sbxvar.hxx>
-
+#include <unotools/syslocale.hxx>
 #include "swdllapi.h"
 
 class CharClass;
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 6935b842db2c..e3f64d88a4fb 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -19,21 +19,17 @@
 #ifndef _CCOLL_HXX
 #define _CCOLL_HXX
 
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
-#include <tools/string.hxx>
 #include <sfx2/tabdlg.hxx>
-
+#include <svtools/svtabbx.hxx>
 #include <vcl/fixed.hxx>
-
 #include <vcl/button.hxx>
-#include <svtools/svtabbx.hxx>
-
 #include <vcl/lstbox.hxx>
 #include "swdllapi.h"
 #include "cmdid.h"
 
-#include <rtl/string.hxx>
-
 //***********************************************************
 
 struct CollName {
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index e9843292c2d8..8994c37bdf06 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/i18n/WordType.hpp>
 
 #include <rtl/ustring.hxx>
-#include <tools/string.hxx>
 #include <tools/link.hxx>
 #include <tools/rtti.hxx>
 
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 118dba8b6fce..8ad766fe43e9 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -22,9 +22,9 @@
 #ifdef DBG_UTIL
 
 #include <boost/unordered_map.hpp>
+#include <rtl/ustring.hxx>
 #include <tox.hxx>
 #include <cstdio>
-#include "tools/string.hxx"
 
 class SwNode;
 class SwTxtAttr;
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index d5b20702d3a6..9ab0b91b36cf 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -19,8 +19,7 @@
 #ifndef _SWDBMGR_HXX
 #define _SWDBMGR_HXX
 
-
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/link.hxx>
 #include <com/sun/star/util/Date.hpp>
 #include "swdllapi.h"
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 333d6db26af5..1891f3ad126d 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -31,7 +31,6 @@
 
 #include <svl/lstner.hxx>
 #include <svtools/embedhlp.hxx>
-#include <tools/string.hxx>
 
 class SwDoc;
 class SfxDocumentInfoDialog;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 013fcdc2824d..d3a1aa5a3516 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <tools/string.hxx>
 #include <vcl/font.hxx>
 #include <editeng/swafopt.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 8b89070aa40d..590f53449c54 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -23,7 +23,7 @@
 #include <frmatr.hxx>
 #include <swtypes.hxx> // For MAXLEVEL.
 #include <boost/ptr_container/ptr_vector.hpp>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 class SwDoc; // For friend.
 
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index f1b8975028e7..b8ea3333b60d 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -19,8 +19,7 @@
 #ifndef _FMTRFMRK_HXX
 #define _FMTRFMRK_HXX
 
-
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
 
 class SwTxtRefMark;
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index f322e75769b4..bfe0c2585840 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/text/PositionLayoutDir.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <format.hxx>
 #include "swdllapi.h"
 
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index a5f1e840ddea..aaad290ff3f4 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -19,7 +19,7 @@
 #ifndef _FTNINFO_HXX
 #define _FTNINFO_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include "swdllapi.h"
 #include <calbck.hxx>
 #include <editeng/numitem.hxx>
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index e664538a285a..6934c26142e0 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -23,6 +23,7 @@
 
 #include "rtl/instance.hxx"
 #include <tools/solar.h>
+#include <tools/string.hxx>
 #include <tools/rtti.hxx>               // for RTTI of SwIndexReg
 #include <swdllapi.h>
 
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index e347c190c8b0..ef9933d33fdd 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -20,11 +20,11 @@
 #ifndef _IODETECT_HXX_
 #define _IODETECT_HXX_
 
+#include <osl/endian.h>
+#include <rtl/ustring.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <osl/endian.h>
-#include <tools/string.hxx>
 #include <swddllapi.h>
 
 #define FILTER_RTF      "RTF"       ///< RTF filter
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index 5b0a703e7828..1d85296d28a7 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -20,7 +20,7 @@
 #ifndef LIST_HXX_INCLUDED
 #define LIST_HXX_INCLUDED
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 class SwNumRule;
 class SwNodes;
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index b6b5543d21eb..56093c22bd70 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -27,7 +27,6 @@
 #include <format.hxx>
 #include <swtypes.hxx>
 #include <editeng/adjustitem.hxx>
-#include <tools/string.hxx>
 
 class SwCharFmt;
 class IntlWrapper;
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 053b441ada8a..2ffc449f0fef 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -28,7 +28,6 @@
 #include "salhelper/simplereferenceobject.hxx"
 #include "svl/urihelper.hxx"
 #include "svtools/treelistentry.hxx"
-#include "tools/string.hxx"
 #include "vcl/metric.hxx"
 #include "vcl/svapp.hxx"
 #include <algorithm>
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index df7a92b18562..6a2750b93ffc 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -20,7 +20,7 @@
 #define _REDLINE_HXX
 
 #include <tools/datetime.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 #include <pam.hxx>
 
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 3f1bcf6c4e1c..85d5d95b7971 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -20,7 +20,7 @@
 #define _SHELLRES_HXX
 
 #include <swdllapi.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/rc.hxx>
 #include <vcl/bitmap.hxx>
 
diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx
index 87029f4203a8..f8a3bf1b1fec 100644
--- a/sw/inc/sortopt.hxx
+++ b/sw/inc/sortopt.hxx
@@ -19,7 +19,7 @@
 #ifndef _SORTOPT_HXX
 #define _SORTOPT_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include "swdllapi.h"
 #include <vector>
 
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 2e039534e033..f5ed3bf60cf3 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -21,7 +21,6 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <svx/svxdlg.hxx>
 #include <vcl/syswin.hxx>
diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx
index f624ad79eaca..d98d0ff3a71e 100644
--- a/sw/inc/swcalwrp.hxx
+++ b/sw/inc/swcalwrp.hxx
@@ -21,7 +21,7 @@
 #define _SWCALWRP_HXX
 
 #include <i18nlangtag/lang.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <unotools/calendarwrapper.hxx>
 #include <salhelper/singletonref.hxx>
 
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 55aab0fd6673..33ce24e5c9fc 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -20,7 +20,7 @@
 #define _TXTFLD_HXX
 
 #include <txatbase.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 class SwTxtNode;
 
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 656d1c451147..16baeacc6def 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -48,7 +48,6 @@
 #include <cppuhelper/implbase10.hxx> // helper for implementations
 #include <cppuhelper/weakref.hxx>
 
-#include <tools/string.hxx>
 #include <tools/link.hxx>
 #include <vcl/timer.hxx>
 
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index 9b683bb3f29b..63d3f72e9f0e 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase3.hxx> // helper for implementations
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 class SfxItemPropertySet;
 class SwXTextDocument;
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 342759d059b2..19f1db863bee 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -40,7 +40,6 @@
 #include <cppuhelper/interfacecontainer.h>
 
 #include <comphelper/uno3.hxx>
-#include <tools/string.hxx>
 
 #include <calbck.hxx>
 #include <TextCursorHelper.hxx>
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 3a91d57f0e19..93683e282c5a 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -23,7 +23,6 @@
 #include <config_features.h>
 
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <tools/color.hxx>
 
 #include <sfx2/zoomitem.hxx>
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 880998a199ff..7a3e68f13a3f 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -21,8 +21,8 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
 
 TYPEINIT0(SwIndexReg);
 
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 0e6b2acf2ac4..42c9d1304866 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "swtypes.hxx"
-#include "tools/string.hxx"
+#include <rtl/ustring.hxx>
 
 #include <bodyfrm.hxx>
 #include <cellfrm.hxx>
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 75c5c7187e24..233326a1a54a 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -19,7 +19,7 @@
 
 #ifdef DBG_UTIL
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/itemiter.hxx>
 #include <string>
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index 46dee451bae1..72c82bcfebbe 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -22,8 +22,8 @@
 
 #include <undobj.hxx>
 #include <memory>
+#include <rtl/ustring.hxx>
 #include <svl/itemset.hxx>
-#include <tools/string.hxx>
 #include <swtypes.hxx>
 #include <calbck.hxx>
 #include <set>
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index fd9c201c26ed..e71e9d028fad 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -22,7 +22,7 @@
 
 #include <undobj.hxx>
 #include <calbck.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 class SfxItemSet;
 class SwFmtColl;
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx
index 39b20f0a40c1..a21b56cf8120 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -21,8 +21,8 @@
 #define SW_UNDO_DELETE_HXX
 
 #include <undobj.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/mempool.hxx>
-#include <tools/string.hxx>
 
 class SwRedlineSaveDatas;
 class SwTxtNode;
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index a235a992aa42..3a046b2848f9 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -21,8 +21,8 @@
 #define SW_UNDO_INSERT_HXX
 
 #include <undobj.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/mempool.hxx>
-#include <tools/string.hxx>
 #include <swtypes.hxx>
 #include <IDocumentContentOperations.hxx>
 
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index 5dd6b72a2848..b037e8f2169c 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -23,7 +23,7 @@
 #include <vector>
 #include <undobj.hxx>
 #include <boost/shared_ptr.hpp>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <numrule.hxx>
 
 //----------- Undo for Numbering -------------------------------------
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index c21857bd5cc8..6e6f02bc66ed 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -21,7 +21,7 @@
 #define SW_UNDO_OVERWRITE_HXX
 
 #include <com/sun/star/uno/Sequence.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <undobj.hxx>
 
 class SwRedlineSaveDatas;
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index 0e5490ce8d0b..08b2d48417a6 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -22,7 +22,7 @@
 
 #include <undobj.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 struct SwSortOptions;
 class SwTableNode;
diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx
index 6783f2eaa6d3..a7ddbc530402 100644
--- a/sw/source/core/inc/retrieveinputstream.hxx
+++ b/sw/source/core/inc/retrieveinputstream.hxx
@@ -20,7 +20,7 @@
 #define _RETRIEVEINPUTSTREAM_HXX
 
 #include <observablethread.hxx>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <retrievedinputstreamdata.hxx>
 
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 8a8f9aacc865..88fea8872f16 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -19,17 +19,13 @@
 #ifndef SW_VIEWIMP_HXX
 #define SW_VIEWIMP_HXX
 
-#include <vector>
-
-#include <vcl/timer.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/color.hxx>
-
 #include <svx/svdtypes.hxx>
-
-#include <tools/string.hxx>
-
-#include <swtypes.hxx>
+#include <vcl/timer.hxx>
 #include <swrect.hxx>
+#include <swtypes.hxx>
+#include <vector>
 
 class ViewShell;
 class SwFlyFrm;
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 4cc95ddc164a..086c85af8bf9 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include <tools/color.hxx>
+#include <tools/string.hxx>
 #include <viewopt.hxx>
 
 class SwWrongList;
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index 1d03a6064b1b..6a35a95da24a 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -19,7 +19,6 @@
 
 
 #include <tools/resid.hxx>
-#include <tools/string.hxx>
 
 #include <poolfmt.hxx>
 #include <charfmt.hxx>
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 91345de97e0a..3b895574a0fd 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -31,8 +31,7 @@
 #include <comphelper/types.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/datetime.hxx>
-#include <tools/string.hxx>
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/content.hxx>
 #include <swunohelper.hxx>
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index ce90177ed43b..7600816d00a6 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -28,7 +28,6 @@
 
 #include <svl/languageoptions.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
-#include <tools/string.hxx>
 #include <tools/resary.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <vcl/outdev.hxx>
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index fa1771d55af1..0a6818289280 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -24,7 +24,6 @@
 #include <comphelper/string.hxx>
 #include <svx/svxids.hrc>
 #include "hintids.hxx"
-#include <tools/string.hxx>
 #include <svl/urihelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 9eee98e34acf..f33696ca7f10 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -24,7 +24,6 @@
 #include <map>
 #include <vector>
 #include <swtypes.hxx>       //SwTwips
-#include <tools/string.hxx>  //String
 #include "wwstyles.hxx"      //ww::sti
 #include <rtl/textenc.h>     //rtl_TextEncoding
 #include <tools/gen.hxx>     //Size
diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/ui/inc/bookctrl.hxx
index 32a61eec0086..8749c311d90e 100644
--- a/sw/source/ui/inc/bookctrl.hxx
+++ b/sw/source/ui/inc/bookctrl.hxx
@@ -19,8 +19,8 @@
 #ifndef _BOOKCTRL_HXX
 #define _BOOKCTRL_HXX
 
+#include <rtl/ustring.hxx>
 #include <sfx2/stbitem.hxx>
-#include <tools/string.hxx>
 
 // class BookmarkToolBoxControl -------------------------------------------
 
diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx
index 395100a5d7e4..133a43c2a3ca 100644
--- a/sw/source/ui/inc/caption.hxx
+++ b/sw/source/ui/inc/caption.hxx
@@ -19,7 +19,7 @@
 #ifndef _CAPTION_HXX
 #define _CAPTION_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/globname.hxx>
 #include <SwCapObjType.hxx>
 #include "swdllapi.h"
diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx
index 26297e72cd8c..c8bfec0998c8 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/sw/source/ui/inc/fontcfg.hxx
@@ -19,8 +19,8 @@
 #ifndef _FONTCFG_HXX
 #define _FONTCFG_HXX
 
+#include <rtl/ustring.hxx>
 #include <unotools/configitem.hxx>
-#include <tools/string.hxx>
 #include <i18nlangtag/lang.h>
 #include <osl/diagnose.h>
 #include "swdllapi.h"
diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx
index 8c9fca86bb3c..0506ff843460 100644
--- a/sw/source/ui/inc/gloslst.hxx
+++ b/sw/source/ui/inc/gloslst.hxx
@@ -20,9 +20,8 @@
 #ifndef _GLOSLST_HXX
 #define _GLOSLST_HXX
 
-
+#include <rtl/ustring.hxx>
 #include <tools/datetime.hxx>
-#include <tools/string.hxx>
 #include <vcl/timer.hxx>
 
 class SwGlossaries;
diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx
index 1cfc81a36459..6e2f3e39cdeb 100644
--- a/sw/source/ui/inc/navicont.hxx
+++ b/sw/source/ui/inc/navicont.hxx
@@ -20,7 +20,7 @@
 #ifndef _NAVICONT_HXX
 #define _NAVICONT_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 class SwDocShell;
 class TransferDataContainer;
diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx
index 1f689e3e5e99..243f7e672768 100644
--- a/sw/source/ui/inc/swcont.hxx
+++ b/sw/source/ui/inc/swcont.hxx
@@ -20,7 +20,7 @@
 #ifndef _SWCONT_HXX
 #define _SWCONT_HXX
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 class SwContentType;