10 files changed, 12 insertions, 19 deletions
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index 53086c7f5287..a2b5b8a721b3 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -20,11 +20,9 @@
 #ifndef _PSPRINT_FONTCACHE_HXX
 #define _PSPRINT_FONTCACHE_HXX
 
-#include "vcl/dllapi.h"
-#include "vcl/fontmanager.hxx"
-
-#include "tools/string.hxx"
-
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/fontmanager.hxx>
 #include <boost/unordered_map.hpp>
 
 namespace psp
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index 0c2df2637b76..4f00487da2c4 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -20,8 +20,8 @@
 #ifndef _SV_FONTSUBSET_HXX
 #define _SV_FONTSUBSET_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <cstdio>
 
 #include "vcl/dllapi.h"
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index e849fa5a07fb..8abdd35192ac 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -20,8 +20,8 @@
 #ifndef _SV_IMPFONT_HXX
 #define _SV_IMPFONT_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/color.hxx>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index e3af7b3f425a..f88a88bcfc0d 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -20,8 +20,8 @@
 #ifndef _SV_OUTFONT_HXX
 #define _SV_OUTFONT_HXX
 
+#include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <tools/string.hxx>
 #include <i18nlangtag/lang.h>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 55bc006f90e5..1ae6087751be 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -21,7 +21,7 @@
 #define _SV_SALWTYPE_HXX
 
 #include <i18nlangtag/lang.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
 
 class SalGraphics;
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index bc4a59b89a02..3043ad7cf5d4 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -24,11 +24,10 @@
 
 #include <osl/thread.hxx>
 #include <rtl/ref.hxx>
-
+#include <rtl/ustring.hxx>
 #include "tools/shl.hxx"
 #include "tools/link.hxx"
 #include "tools/fldunit.hxx"
-#include "tools/string.hxx"
 #include "tools/color.hxx"
 #include "tools/debug.hxx"
 
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 2b51699c1d7e..dfc4008bd158 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -20,11 +20,9 @@
 #ifndef VCL_TEXTLAYOUT_HXX
 #define VCL_TEXTLAYOUT_HXX
 
-#include "vcl/outdev.hxx"
-
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
-
+#include <vcl/outdev.hxx>
 #include <memory>
 
 class Control;
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 96e2c5713fdf..115182364dd8 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -20,8 +20,8 @@
 #ifndef _SV_TOOLBOX_H
 #define _SV_TOOLBOX_H
 
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <tools/solar.h>
 #include <vcl/image.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 233b6beb93b7..f1769ed7221d 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -20,8 +20,6 @@
 #ifndef _SAL_I18N_STATUS_HXX
 #define _SAL_I18N_STATUS_HXX
 
-#include <tools/string.hxx>
-
 #include <rtl/ustring.hxx>
 #include <salimestatus.hxx>
 
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index 9eb7ad275abb..2c2ee3b38c13 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -20,7 +20,7 @@
 #ifndef _VCL_WMADAPTOR_HXX_
 #define _VCL_WMADAPTOR_HXX_
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #ifndef _PREX_H
 #include <prex.h>