10 files changed, 13 insertions, 16 deletions
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;