tdf#42949 Fix IWYU warnings in include/vcl/[i-m]*

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

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

24 files changed, 31 insertions, 55 deletions

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 17d57b5172ce..3d6389e633f3 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -319,3 +319,11 @@ blacklist:
     include/vcl/help.hxx:
     # Needed for template
     - o3tl/typed_flags_set.hxx
+    include/vcl/imap.hxx:
+    # Needed for implicit dtor
+    - vcl/imapobj.hxx
+    include/vcl/keycodes.hxx:
+    # Needed for macros
+    - com/sun/star/awt/Key.hpp
+    - com/sun/star/awt/KeyGroup.hpp
+
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index 6d9a1e4f764b..d462088fc2d4 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -24,6 +24,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <vcl/metric.hxx>
+#include <vcl/vclptr.hxx>
 #include <tools/solar.h>
 
 #include <vector>
diff --git a/include/vcl/IDialogRenderable.hxx b/include/vcl/IDialogRenderable.hxx
index a2c9b8416ccd..e5596c5fe88f 100644
--- a/include/vcl/IDialogRenderable.hxx
+++ b/include/vcl/IDialogRenderable.hxx
@@ -13,7 +13,6 @@
 
 #include <vcl/dllapi.h>
 
-#include <tools/gen.hxx>
 #include <rtl/ustring.hxx>
 
 #include <vector>
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index d50f1ff192d4..2064b934b5c2 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -11,16 +11,13 @@
 #ifndef INCLUDED_VCL_ITILEDRENDERABLE_HXX
 #define INCLUDED_VCL_ITILEDRENDERABLE_HXX
 
-#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>
 #include <vcl/ptrstyle.hxx>
-#include <vcl/virdev.hxx>
-#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
+#include <map>
 
 namespace vcl
 {
diff --git a/include/vcl/IconThemeScanner.hxx b/include/vcl/IconThemeScanner.hxx
index 03f472bd5928..3cbca74a4683 100644
--- a/include/vcl/IconThemeScanner.hxx
+++ b/include/vcl/IconThemeScanner.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_VCL_ICONTHEMESCANNER_HXX
 
 #include <vcl/dllapi.h>
-#include <tools/solar.h>
 
 #include <rtl/ustring.hxx>
 #include <vcl/IconThemeInfo.hxx>
@@ -22,11 +21,6 @@
 // forward declaration of unit test class. Required for friend relationship.
 class IconThemeScannerTest;
 
-namespace osl {
-class Directory;
-class DirectoryItem;
-}
-
 namespace vcl {
 
 /** This class scans a folder for icon themes and provides the results.
diff --git a/include/vcl/ImageTree.hxx b/include/vcl/ImageTree.hxx
index 4b49a31f30b9..1834bad71646 100644
--- a/include/vcl/ImageTree.hxx
+++ b/include/vcl/ImageTree.hxx
@@ -22,9 +22,11 @@
 
 #include <memory>
 #include <sal/config.h>
-#include <tools/stream.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/bitmapex.hxx>
+#include <rtl/ustring.hxx>
+#include <o3tl/typed_flags_set.hxx>
+
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
 
 enum class ImageLoadFlags : sal_uInt16
 {
@@ -42,6 +44,8 @@ namespace com { namespace sun { namespace star { namespace container {
 }}}}
 
 class ImplImageTree;
+class BitmapEx;
+class SvMemoryStream;
 
 class ImageTree
 {
diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx
index 8742093ebe36..b3657afe7da6 100644
--- a/include/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
@@ -41,8 +41,6 @@ namespace utl {
 
 class LocaleDataWrapper;
 
-class Date;
-
 namespace vcl
 {
 
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 526243bcf382..17bfce780461 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -22,18 +22,14 @@
 
 #include <vcl/dllapi.h>
 #include <tools/gen.hxx>
-#include <tools/solar.h>
 #include <vcl/bitmapex.hxx>
 #include <vcl/outdev.hxx>
 
-#include <com/sun/star/uno/Reference.hxx>
-
 #include <memory>
-#include <vector>
 
 struct ImplImage;
-struct ImplImageList;
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphic;} } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
 
 namespace vcl
 {
diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx
index e143e7b811c8..e2217b87b6e8 100644
--- a/include/vcl/imap.hxx
+++ b/include/vcl/imap.hxx
@@ -28,7 +28,6 @@
 #include <vector>
 
 class Point;
-namespace tools { class Rectangle; }
 class Size;
 class Fraction;
 class IMapObject;
diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx
index 1e5ab2e5c18c..b5fedbd3cfb2 100644
--- a/include/vcl/imapobj.hxx
+++ b/include/vcl/imapobj.hxx
@@ -25,7 +25,6 @@
 #include <rtl/strbuf.hxx>
 
 class Point;
-namespace tools { class Rectangle; }
 class SvStream;
 
 #define IMAP_OBJ_RECTANGLE  (sal_uInt16(0x0001))
diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx
index 528f2046fd52..a38829776236 100644
--- a/include/vcl/imgctrl.hxx
+++ b/include/vcl/imgctrl.hxx
@@ -23,7 +23,6 @@
 #include <vcl/dllapi.h>
 
 #include <vcl/fixed.hxx>
-#include <vcl/bitmapex.hxx>
 
 
 class VCL_DLLPUBLIC ImageControl : public FixedImage
diff --git a/include/vcl/inetimg.hxx b/include/vcl/inetimg.hxx
index 374a2122dfc6..64d64c122553 100644
--- a/include/vcl/inetimg.hxx
+++ b/include/vcl/inetimg.hxx
@@ -19,12 +19,10 @@
 #ifndef INCLUDED_VCL_INETIMG_HXX
 #define INCLUDED_VCL_INETIMG_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #include <sot/formats.hxx>
 
-class SvData;
-class SotDataObject;
-
 
 class INetImage
 {
diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx
index 95c860e1a902..25d057b91b99 100644
--- a/include/vcl/inputctx.hxx
+++ b/include/vcl/inputctx.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INPUTCTX_HXX
 #define INCLUDED_VCL_INPUTCTX_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
 #include <o3tl/typed_flags_set.hxx>
diff --git a/include/vcl/introwin.hxx b/include/vcl/introwin.hxx
index 502a84fd90d5..af5eb1ad57d7 100644
--- a/include/vcl/introwin.hxx
+++ b/include/vcl/introwin.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INTROWIN_HXX
 #define INCLUDED_VCL_INTROWIN_HXX
 
-#include <vcl/bitmapex.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/wrkwin.hxx>
 
diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx
index a641ea018797..ff7b5dfb65a6 100644
--- a/include/vcl/jobset.hxx
+++ b/include/vcl/jobset.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_VCL_JOBSET_HXX
 #define INCLUDED_VCL_JOBSET_HXX
 
+#include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/prntypes.hxx>
 #include <o3tl/cow_wrapper.hxx>
 
 class SvStream;
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 0c4cb53bc523..86a967c66415 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -12,13 +12,10 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/help.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/vclmedit.hxx>
 #include <vcl/window.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/IContext.hxx>
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index f7d74573de66..013205b3a64e 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -21,18 +21,11 @@
 #define INCLUDED_VCL_LAZYDELETE_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/vclptr.hxx>
-#include <vcl/window.hxx>
-
-#include <unordered_map>
-#include <vector>
-#include <algorithm>
-#include <sal/log.hxx>
-
-#include <typeinfo>
 
 #include <com/sun/star/lang/XComponent.hpp>
 
+#include <memory>
+
 namespace vcl
 {
     /*
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index f09097c5d2bf..e0be5fa62a41 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -29,7 +29,6 @@
 class Point;
 class Fraction;
 class SvStream;
-class OutputDevice;
 
 
 class VCL_DLLPUBLIC MapMode
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 0141582f1af1..552a596b46a0 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -23,17 +23,15 @@
 #include <memory>
 #include <vcl/vclenum.hxx>
 #include <tools/link.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
-#include <vcl/bitmapex.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/vclreferencebase.hxx>
 #include <vcl/vclevent.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <list>
 
+class OutputDevice;
 struct ImplSVEvent;
 struct MenuItemData;
 class Point;
@@ -41,7 +39,6 @@ class Size;
 namespace tools { class Rectangle; }
 class Menu;
 class MenuItemList;
-class HelpEvent;
 class Image;
 class PopupMenu;
 class KeyEvent;
@@ -56,6 +53,8 @@ namespace com { namespace sun { namespace star { namespace accessibility {
     class XAccessible;
 }}}}
 
+namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+
 namespace vcl
 {
 class Window;
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index a76e3a3aba94..90d42fc607fc 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -24,11 +24,8 @@
 #include <vcl/dllapi.h>
 #include <memory>
 
-class FloatingWindow;
 class Timer;
 class PopupMenu;
-class VclBuilder;
-class VclSimpleEvent;
 
 class VCL_DLLPUBLIC MenuButton : public PushButton
 {
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 526582aea20f..3beec1fbf42e 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -30,8 +30,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/region.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/outdev.hxx>
+#include <vcl/outdevstate.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/lineinfo.hxx>
@@ -39,6 +38,7 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <rtl/ref.hxx>
 
+class OutputDevice;
 class SvStream;
 enum class DrawTextFlags;
 
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 3709364a0b5c..55d26cede8fd 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -22,11 +22,11 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
-#include <vcl/outdev.hxx>
+#include <tools/ref.hxx>
+#include <tools/gen.hxx>
 
 class ImplFontMetric;
-class ImplFontCharMap;
-class CmapResult;
+class FontCharMap;
 
 typedef sal_uInt32 sal_UCS4;
 typedef tools::SvRef<FontCharMap> FontCharMapRef;
diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index f7db3a3095fb..2404d7c97ca5 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -21,10 +21,10 @@
 #define INCLUDED_VCL_MNEMONIC_HXX
 
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
 
+namespace com { namespace sun { namespace star { namespace i18n { class XCharacterClassification; } } } }
 
 // Mnemonic Chars, which we want support
 // Latin 0-9
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index c66142b9035a..3a43ee2c7386 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -40,6 +40,7 @@
 #include <vcl/keycod.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/vclenum.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <com/sun/star/uno/Reference.h>