tdf#42949 Fix IWYU warnings in include/vcl/[B-E]*

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

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

30 files changed, 41 insertions, 59 deletions

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 14410a256ad9..d802d6b26af9 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -301,4 +301,15 @@ blacklist:
     # Needed for macros
     - vcl/builder.hxx
     - vcl/vclptr.hxx
-
+    include/vcl/devicecoordinate.hxx:
+    # Needed for #if configure switch
+    - basegfx/point/b2ipoint.hxx
+    include/vcl/errinf.hxx:
+    # Needed for template
+    - o3tl/typed_flags_set.hxx
+    include/vcl/edit.hxx:
+    # Needed for template
+    - o3tl/deleter.hxx
+    include/vcl/event.hxx:
+    # Needed for enum type 
+    - vcl/window.hxx
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 6025c57416ae..9f5ff8c1df09 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -25,6 +25,7 @@
 #include <svtools/svtabbx.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <unotools/collatorwrapper.hxx>
+#include <vcl/commandevent.hxx>
 
 class SvSimpleTable;
 class SVT_DLLPUBLIC SvSimpleTableContainer : public Control
diff --git a/include/vcl/BitmapAlphaClampFilter.hxx b/include/vcl/BitmapAlphaClampFilter.hxx
index f4325b8b9e15..d99e731b292a 100644
--- a/include/vcl/BitmapAlphaClampFilter.hxx
+++ b/include/vcl/BitmapAlphaClampFilter.hxx
@@ -11,8 +11,6 @@
 #ifndef INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX
 #define INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX
 
-#include <tools/color.hxx>
-
 #include <vcl/BitmapFilter.hxx>
 
 /** If the alpha is beyond a certain threshold, make it fully transparent
diff --git a/include/vcl/BitmapColorQuantizationFilter.hxx b/include/vcl/BitmapColorQuantizationFilter.hxx
index 4be1ff3b9f49..c3fd049de0ff 100644
--- a/include/vcl/BitmapColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapColorQuantizationFilter.hxx
@@ -11,8 +11,6 @@
 #ifndef INCLUDED_INCLUDE_VCL_BITMAPCOLORQUANTIZATIONFILTER_HXX
 #define INCLUDED_INCLUDE_VCL_BITMAPCOLORQUANTIZATIONFILTER_HXX
 
-#include <tools/color.hxx>
-
 #include <vcl/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapColorQuantizationFilter : public BitmapFilter
diff --git a/include/vcl/BitmapFilter.hxx b/include/vcl/BitmapFilter.hxx
index 9fc8f8017683..19599d06316f 100644
--- a/include/vcl/BitmapFilter.hxx
+++ b/include/vcl/BitmapFilter.hxx
@@ -12,7 +12,7 @@
 #define INCLUDED_VCL_BITMAPFILTER_HXX
 
 #include <vcl/bitmapex.hxx>
-#include <vcl/animate.hxx>
+class Animation;
 
 class VCL_DLLPUBLIC BitmapFilter
 {
diff --git a/include/vcl/BitmapMonochromeFilter.hxx b/include/vcl/BitmapMonochromeFilter.hxx
index 0c344b467d94..6ce71a69d92c 100644
--- a/include/vcl/BitmapMonochromeFilter.hxx
+++ b/include/vcl/BitmapMonochromeFilter.hxx
@@ -11,8 +11,6 @@
 #ifndef INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX
 #define INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX
 
-#include <tools/color.hxx>
-
 #include <vcl/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapMonochromeFilter : public BitmapFilter
diff --git a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
index 5072c3f17cd8..b311f8fc266d 100644
--- a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
@@ -11,8 +11,6 @@
 #ifndef INCLUDED_INCLUDE_VCL_BITMAPSIMPLECOLORQUANTIZATIONFILTER_HXX
 #define INCLUDED_INCLUDE_VCL_BITMAPSIMPLECOLORQUANTIZATIONFILTER_HXX
 
-#include <tools/color.hxx>
-
 #include <vcl/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapSimpleColorQuantizationFilter : public BitmapFilter
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 90c45fc6ebde..6a8f6c8b9605 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -14,17 +14,17 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/ImageTree.hxx>
 #include <vcl/salbtype.hxx>
-#include <tools/stream.hxx>
 #if ENABLE_CAIRO_CANVAS
 #include <vcl/cairo.hxx>
 #endif
-#include <com/sun/star/geometry/IntegerPoint2D.hpp>
-#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
 #include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <o3tl/safeint.hxx>
 #include <array>
 
+class SvStream;
+namespace basegfx { class B2DHomMatrix; }
+namespace com { namespace sun { namespace star { namespace geometry { struct IntegerRectangle2D; } } } }
+
 namespace vcl {
 namespace bitmap {
 
diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx
index 5a63d00c22e6..ba7480409b3b 100644
--- a/include/vcl/EnumContext.hxx
+++ b/include/vcl/EnumContext.hxx
@@ -23,8 +23,6 @@
 
 #include <rtl/ustring.hxx>
 
-#include <vector>
-
 
 namespace vcl {
 
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 7f8f7ce4c332..d50f1ff192d4 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -14,6 +14,7 @@
 #include <LibreOfficeKit/LibreOfficeKitTypes.h>
 #include <tools/gen.hxx>
 #include <svx/ruler.hxx>
+#include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/pointr.hxx>
diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx
index 915e4e218cd3..94be4627596c 100644
--- a/include/vcl/canvastools.hxx
+++ b/include/vcl/canvastools.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/rendering/XColorSpace.hpp>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/range/b2irectangle.hxx>
 
@@ -31,11 +30,6 @@
 class Point;
 class Size;
 namespace tools { class Rectangle; }
-namespace tools {
-    class Polygon;
-    class PolyPolygon;
-}
-class Bitmap;
 class BitmapEx;
 class Color;
 
@@ -58,12 +52,12 @@ namespace com { namespace sun { namespace star { namespace geometry
 
 namespace com { namespace sun { namespace star { namespace rendering
 {
-    class  XGraphicDevice;
     class  XBitmap;
-    class  XIntegerBitmap;
     class  XIntegerReadOnlyBitmap;
 } } } }
 
+namespace com { namespace sun { namespace star { namespace rendering { class XColorSpace; } } } }
+
 namespace vcl
 {
     namespace unotools
diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx
index f934cb6ceb7e..c20cc745328a 100644
--- a/include/vcl/checksum.hxx
+++ b/include/vcl/checksum.hxx
@@ -23,7 +23,6 @@
 
 #include <sal/config.h>
 #include <sal/types.h>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 
 #define BITMAP_CHECKSUM_SIZE 8
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx
index d8f20a381be5..88185efde077 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -24,9 +24,9 @@
 #include <tools/gen.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
-#include <vcl/keycod.hxx>
-#include <vcl/font.hxx>
+#include <vcl/keycodes.hxx>
 #include <o3tl/typed_flags_set.hxx>
+#include <rtl/ustring.hxx>
 
 class CommandExtTextInputData;
 class CommandWheelData;
diff --git a/include/vcl/commandinfoprovider.hxx b/include/vcl/commandinfoprovider.hxx
index ce695cee8b79..96a77cfb7520 100644
--- a/include/vcl/commandinfoprovider.hxx
+++ b/include/vcl/commandinfoprovider.hxx
@@ -22,7 +22,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/image.hxx>
 
-#include <com/sun/star/frame/XFrame.hpp>
+namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
 
 namespace vcl { namespace CommandInfoProvider {
 
diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx
index 50bba28396a0..cd2779eaac1d 100644
--- a/include/vcl/configsettings.hxx
+++ b/include/vcl/configsettings.hxx
@@ -20,12 +20,13 @@
 #define INCLUDED_VCL_CONFIGSETTINGS_HXX
 
 #include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <unotools/configitem.hxx>
 #include <vcl/dllapi.h>
 
 #include <unordered_map>
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
 namespace vcl
 {
     typedef std::unordered_map< OUString, OUString > OUStrMap;
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 48daf0e5401e..391c576ddff3 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -21,14 +21,12 @@
 #define INCLUDED_VCL_CTRL_HXX
 
 #include <tools/link.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/window.hxx>
-#include <vcl/salnativewidgets.hxx>
 #include <memory>
 
 // forward
-namespace vcl { struct ImplControlData; struct ControlLayoutData; }
+namespace vcl { struct ImplControlData; }
 class StyleSettings;
 
 
diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx
index b4d7641a0dd8..632578072775 100644
--- a/include/vcl/cvtgrf.hxx
+++ b/include/vcl/cvtgrf.hxx
@@ -25,7 +25,6 @@
 #include <vcl/salctype.hxx>
 
 
-struct  ConvertData;
 class   Graphic;
 
 class VCL_DLLPUBLIC GraphicConverter
diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx
index a4331adc4d87..32afcfc24737 100644
--- a/include/vcl/debugevent.hxx
+++ b/include/vcl/debugevent.hxx
@@ -15,7 +15,8 @@
 #include <vcl/dllapi.h>
 #include <vcl/timer.hxx>
 #include <sal/types.h>
-#include <vcl/window.hxx>
+
+namespace vcl { class Window; }
 
 class VCL_DLLPUBLIC DebugEventInjector : private Timer {
   sal_uInt32 mnEventsLeft;
diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx
index 136780893f52..f998a993fe78 100644
--- a/include/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
@@ -21,14 +21,15 @@
 #define INCLUDED_VCL_DECOVIEW_HXX
 
 #include <vcl/dllapi.h>
+#include <vcl/outdev.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclenum.hxx>
-#include <o3tl/typed_flags_set.hxx>
 
 namespace tools { class Rectangle; }
 class Point;
 class Color;
-class OutputDevice;
+
+namespace o3tl { template <typename T> struct typed_flags; }
 
 // Flags for DrawSymbol()
 enum class DrawSymbolFlags
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index b6d7bbdb110e..96690febcad5 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -21,11 +21,9 @@
 #define INCLUDED_VCL_DIALOG_HXX
 
 #include <memory>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/syswin.hxx>
 #include <vcl/vclptr.hxx>
-#include <vcl/IDialogRenderable.hxx>
 #include <vcl/abstdlg.hxx>
 
 struct DialogImpl;
diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx
index 9aa9ac5f4203..6c05ca56a172 100644
--- a/include/vcl/dibtools.hxx
+++ b/include/vcl/dibtools.hxx
@@ -20,9 +20,6 @@
 #define INCLUDED_VCL_DIBTOOLS_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/mapmod.hxx>
-#include <vcl/region.hxx>
-#include <vcl/alpha.hxx>
 #include <vcl/salbtype.hxx>
 
 // predefines
@@ -30,6 +27,7 @@
 class SvStream;
 class BitmapEx;
 class Bitmap;
+class AlphaMask;
 
 // - Compression defines
 
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index d2e6a585d633..7bbbc9e49d79 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_VCL_DOCKWIN_HXX
 #define INCLUDED_VCL_DOCKWIN_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/builder.hxx>
 #include <vcl/floatwin.hxx>
-#include <o3tl/deleter.hxx>
 #include <memory>
 #include <vector>
 
+namespace o3tl { template <typename T> struct default_delete; }
+
 // data to be sent with docking events
 struct DockingData
 {
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 63b65e324920..40d2f447e96a 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/ctrl.hxx>
 
-#include <functional>
 #include <memory>
 
 #include <o3tl/deleter.hxx>
diff --git a/include/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx
index 4ffa0bd59a79..7cf4d36126fa 100644
--- a/include/vcl/embeddedfontshelper.hxx
+++ b/include/vcl/embeddedfontshelper.hxx
@@ -12,12 +12,13 @@
 
 #include <vcl/dllapi.h>
 
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/fontenum.hxx>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
 /**
  Helper functions for handling embedded fonts in documents.
 
diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx
index 174c424f2871..a6ef02762c5a 100644
--- a/include/vcl/errcode.hxx
+++ b/include/vcl/errcode.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_ERRCODE_HXX
 
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <ostream>
 
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index f34d5624b991..e3d24ab0cc28 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -30,12 +30,10 @@
 
 #include <limits.h>
 
-namespace vcl { class Window; }
 namespace weld { class Window; }
 
 class ErrorHandler;
 class ErrorContext;
-class ErrorStringFactory;
 class ErrorInfo;
 class DynamicErrorInfo;
 class ImplDynamicErrorInfo;
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 688811746ccc..f160a27c4cd1 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -20,23 +20,15 @@
 #ifndef INCLUDED_VCL_EVENT_HXX
 #define INCLUDED_VCL_EVENT_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <tools/gen.hxx>
 #include <vcl/keycod.hxx>
-#include <vcl/commandevent.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>
 
-class AllSettings;
-struct IDataObject;
-
-namespace com { namespace sun { namespace star { namespace awt {
-    struct KeyEvent;
-    struct MouseEvent;
-} } } }
+class CommandEvent;
 
 enum class TextDirectionality {
     LeftToRight_TopToBottom,
diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index 4650fbc5c6e4..9fdeb16fe8c5 100644
--- a/include/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_VCL_EVNTPOST_HXX
 
 #include <tools/link.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 
 struct ImplSVEvent;
diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx
index bba9ebe6b84c..e143e7b811c8 100644
--- a/include/vcl/imap.hxx
+++ b/include/vcl/imap.hxx
@@ -23,6 +23,7 @@
 #include <vcl/imapobj.hxx>
 #include <vcl/dllapi.h>
 #include <tools/stream.hxx>
+#include <tools/solar.h>
 #include <memory>
 #include <vector>
 
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 22d494dfa6e2..0c4cb53bc523 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -22,6 +22,7 @@
 #include <vcl/window.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/IContext.hxx>
+#include <vcl/commandevent.hxx>
 #include <set>
 
 class VCL_DLLPUBLIC VclContainer : public vcl::Window,