tdf#42949 Fix IWYU warnings in include/rtl/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Iae997959a0ec2c9edb1c795533692ec4e579449f
Reviewed-on: https://gerrit.libreoffice.org/57313
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

6 files changed, 6 insertions, 9 deletions

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 5e9a818b379d..bdd2774b4e81 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -34,3 +34,9 @@ blacklist:
     include/osl/thread.hxx:
     # ODK API test would fail with fw decl here
     - osl/time.h
+    include/rtl/instance.hxx:
+    # Needed for template functions
+    - osl/getglobalmutex.hxx
+    include/rtl/math.hxx:
+    # TODO MSVC does not compile basegfx/numeric/ftools.hxx when this is replaced
+    - math.h
diff --git a/include/rtl/byteseq.h b/include/rtl/byteseq.h
index 640a4e06253a..75bd40210c72 100644
--- a/include/rtl/byteseq.h
+++ b/include/rtl/byteseq.h
@@ -22,7 +22,6 @@
 #include "sal/config.h"
 
 #include "rtl/alloc.h"
-#include "rtl/ustring.h"
 #include "sal/saldllapi.h"
 #include "sal/types.h"
 
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 0c3b53d8e8b4..c674f34d997c 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -23,7 +23,6 @@
 #include "sal/config.h"
 
 #include <cassert>
-#include <cstddef>
 #include <cstring>
 
 #include "rtl/strbuf.h"
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 24b57a91b025..f19d8713eaae 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -26,7 +26,6 @@
 #include <cstddef>
 #include <new>
 #include <ostream>
-#include <utility>
 #include <string.h>
 
 #include "rtl/textenc.h"
@@ -37,8 +36,6 @@
 #include "rtl/stringconcat.hxx"
 #endif
 
-#include "sal/log.hxx"
-
 #ifdef RTL_STRING_UNITTEST
 extern bool rtl_string_unittest_const_literal;
 extern bool rtl_string_unittest_const_literal_function;
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index 5f696bff906d..6958093e71c8 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -23,7 +23,6 @@
 #include "sal/config.h"
 
 #include <cassert>
-#include <cstddef>
 #include <cstring>
 
 #include "rtl/ustrbuf.h"
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 24005b22333d..1795f486162b 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -26,14 +26,11 @@
 #include <cstddef>
 #include <new>
 #include <ostream>
-#include <utility>
-#include <string.h>
 
 #include "rtl/ustring.h"
 #include "rtl/string.hxx"
 #include "rtl/stringutils.hxx"
 #include "rtl/textenc.h"
-#include "sal/log.hxx"
 
 #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
 #include "config_global.h"