tdf#42949 Fix IWYU warnings in include/

Recheck directories under include/ and below vcl in the
module hierarchy.

New IWYU and recent developments in f-u-i helped to identify
some non self contained files, those were fixed too.

Also some new removal proposals are dealt with here.

Change-Id: If12ae37602eecdf3004ae0fa6623d464077d4f9f
Reviewed-on: https://gerrit.libreoffice.org/74213
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

9 files changed, 11 insertions, 4 deletions

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index c69220e197ec..3141da5ac2f9 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -227,6 +227,9 @@ blacklist:
     - com/sun/star/lang/IllegalArgumentException.hpp
     - com/sun/star/uno/RuntimeException.hpp
     - rtl/ustring.hxx
+    include/tools/fldunit.hxx:
+    # Needed for enum type
+    - sal/types.h
     include/tools/svlibrary.h:
     # Used behind #ifndef
     - osl/module.h
diff --git a/include/basegfx/DrawCommands.hxx b/include/basegfx/DrawCommands.hxx
index 92747c5af4d2..1da33c325694 100644
--- a/include/basegfx/DrawCommands.hxx
+++ b/include/basegfx/DrawCommands.hxx
@@ -11,6 +11,11 @@
 #define INCLUDED_BASEGFX_DRAWCOMMANDS_H
 
 #include <memory>
+#include <vector>
+
+#include <basegfx/color/bcolor.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/range/b2drange.hxx>
 
 namespace gfx
 {
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index 1d238192a68d..95400b966021 100644
--- a/include/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/types.h>
 #include <basegfx/color/bcolor.hxx>
-#include <basegfx/basegfxdllapi.h>
 
 namespace basegfx
 {
diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index 73f376a601a4..6276f9008e52 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <comphelper/comphelperdllapi.h>
+#include <comphelper/ChainablePropertySet.hxx>
 #include <rtl/ref.hxx>
 #include <map>
 
diff --git a/include/comphelper/scopeguard.hxx b/include/comphelper/scopeguard.hxx
index 6b5b397686f4..a361c7c5f2b0 100644
--- a/include/comphelper/scopeguard.hxx
+++ b/include/comphelper/scopeguard.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_COMPHELPER_SCOPEGUARD_HXX
 #define INCLUDED_COMPHELPER_SCOPEGUARD_HXX
 
-#include <comphelper/comphelperdllapi.h>
 #include <sal/log.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 
diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx
index a41327f5e928..b804ba3ed559 100644
--- a/include/registry/reader.hxx
+++ b/include/registry/reader.hxx
@@ -28,7 +28,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-#include <algorithm>
 #include <new>
 
 namespace typereg {
diff --git a/include/tools/GenericTypeSerializer.hxx b/include/tools/GenericTypeSerializer.hxx
index 90b5d002c8f1..92f2bdfb169b 100644
--- a/include/tools/GenericTypeSerializer.hxx
+++ b/include/tools/GenericTypeSerializer.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_TOOLS_GENERICTYPESERIALIZER_HXX
 #define INCLUDED_TOOLS_GENERICTYPESERIALIZER_HXX
 
-#include <sal/types.h>
 #include <tools/toolsdllapi.h>
 #include <tools/color.hxx>
 #include <tools/stream.hxx>
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index a70a4e0ab60f..c03d2ec650ca 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -25,6 +25,7 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
+#include <sal/log.hxx>
 #include <tools/toolsdllapi.h>
 #include <cppuhelper/exc_hlp.hxx>
 
diff --git a/include/xmlreader/span.hxx b/include/xmlreader/span.hxx
index 1f4630efca42..db0ed229bcd9 100644
--- a/include/xmlreader/span.hxx
+++ b/include/xmlreader/span.hxx
@@ -25,6 +25,7 @@
 #include <cstddef>
 
 #include <sal/types.h>
+#include <rtl/string.h>
 #include <xmlreader/detail/xmlreaderdllapi.hxx>
 
 namespace rtl { class OUString; }