tdf#42949 Fix IWYU warnings in include/vcl/[ab]*

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

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

8 files changed, 11 insertions, 25 deletions

diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 53e553af4011..353a542439cf 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <tools/link.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
@@ -29,12 +28,12 @@
 #include <functional>
 #include <memory>
 
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/frame/XModel.hpp>
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
 
 namespace vcl { class Window; }
 class Dialog;
-class Bitmap;
 class BitmapEx;
 namespace weld
 {
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 5cc0cdf0a621..98d1bb8a3b61 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -23,7 +23,6 @@
 #include <vcl/dllapi.h>
 #include <vcl/timer.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/vclptr.hxx>
 
 #define ANIMATION_TIMEOUT_ON_CLICK 2147483647L
 
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index b304baa5af01..c23367c34c9a 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_BITMAP_HXX
 #define INCLUDED_VCL_BITMAP_HXX
 
-#include <tools/link.hxx>
 #include <tools/solar.h>
 #include <vcl/checksum.hxx>
 #include <vcl/dllapi.h>
@@ -32,6 +31,8 @@
 
 class Color;
 
+template <typename Arg, typename Ret> class Link;
+
 enum class BmpMirrorFlags
 {
     NONE             = 0x00,
@@ -94,15 +95,10 @@ class   BitmapInfoAccess;
 class   BitmapReadAccess;
 class   BitmapWriteAccess;
 class   BitmapPalette;
-class   Color;
 class   GDIMetaFile;
 class   AlphaMask;
 class   OutputDevice;
 class   SalBitmap;
-namespace vcl
-{
-    class Kernel;
-}
 
 struct BitmapSystemData
 {
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index 9117b57730e4..47eb8cabb31e 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_BMPACC_HXX
 #define INCLUDED_VCL_BMPACC_HXX
 
-#include <memory>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/salbtype.hxx>
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index e5656be11591..c519f459642d 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -24,14 +24,14 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/alpha.hxx>
 #include <tools/color.hxx>
-#include <basegfx/color/bcolormodifier.hxx>
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <sal/types.h>
 
 namespace com { namespace sun { namespace star { namespace rendering {
     class XBitmapCanvas;
 } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace basegfx { class BColorModifierStack; }
 
 enum class TransparentType
 {
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 1883a128f48e..74fc3b44946f 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_VCL_BUILDER_HXX
 
 #include <typeinfo>
-#include <osl/module.hxx>
 #include <sal/log.hxx>
 #include <unotools/resmgr.hxx>
 #include <tools/fldunit.hxx>
@@ -23,17 +22,12 @@
 
 #include <memory>
 #include <map>
-#include <set>
-#include <stack>
 #include <vector>
 #ifdef check
 #  //some problem with MacOSX and a check define
 #  undef check
 #endif
 
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
 class Button;
 class ComboBox;
 class FormattedField;
@@ -51,6 +45,7 @@ class TimeField;
 class VclExpander;
 class VclMultiLineEdit;
 namespace xmlreader { class XmlReader; }
+namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
 
 struct ComboBoxTextItem
 {
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index e4edc323a93b..5bad4b5e2e15 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -24,17 +24,14 @@
 #include <vcl/dllapi.h>
 #include <vcl/image.hxx>
 #include <vcl/ctrl.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/salnativewidgets.hxx>
 #include <vcl/vclenum.hxx>
-#include <vcl/vclptr.hxx>
 #include <memory>
 #include <vector>
 
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
+namespace com { namespace sun { namespace star { namespace frame { struct FeatureStateEvent; } } } }
+template <class T> class VclPtr;
 
 class Color;
-class UserDrawEvent;
 class ImplCommonButtonData;
 enum class DrawButtonFlags;
 
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 3d0e6cb09195..0141582f1af1 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -22,6 +22,7 @@
 
 #include <memory>
 #include <vcl/vclenum.hxx>
+#include <tools/link.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/bitmapex.hxx>