11 files changed, 25 insertions, 40 deletions
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 0b31f60e04ad..9ab4f5754d84 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -12,13 +12,19 @@
 #define INCLUDED_VCL_ITILEDRENDERABLE_HXX
 
 #include <tools/gen.hxx>
-#include <vcl/commandevent.hxx>
-#include <vcl/event.hxx>
-#include <vcl/vclevent.hxx>
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
 #include <vcl/ptrstyle.hxx>
+#include <vcl/vclptr.hxx>
 #include <map>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::datatransfer { namespace clipboard { class XClipboard; } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
+namespace vcl { class Window; }
+
+class VirtualDevice;
 
 namespace vcl
 {
diff --git a/include/vcl/calendar.hxx b/include/vcl/calendar.hxx
index 338392453aec..aef21d674100 100644
--- a/include/vcl/calendar.hxx
+++ b/include/vcl/calendar.hxx
@@ -24,7 +24,6 @@
 #include <unotools/calendarwrapper.hxx>
 
 #include <vcl/ctrl.hxx>
-#include <vcl/field.hxx>
 #include <memory>
 #include <set>
 
@@ -33,10 +32,6 @@ class TrackingEvent;
 class KeyEvent;
 class HelpEvent;
 class DataChangedEvent;
-class FloatingWindow;
-class PushButton;
-class ImplCFieldFloatWin;
-class Button;
 
 /*************************************************************************
 
diff --git a/include/vcl/filter/PngImageReader.hxx b/include/vcl/filter/PngImageReader.hxx
index d15e7d8e31c7..97b2616883b2 100644
--- a/include/vcl/filter/PngImageReader.hxx
+++ b/include/vcl/filter/PngImageReader.hxx
@@ -8,14 +8,21 @@
  *
  */
 
-#include <vcl/dllapi.h>
-#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <tools/stream.hxx>
-#include <vcl/bitmapex.hxx>
-
 #ifndef INCLUDED_VCL_FILTER_PNGIMAGEREADER_HXX
 #define INCLUDED_VCL_FILTER_PNGIMAGEREADER_HXX
 
+#include <vcl/dllapi.h>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com::sun::star::task
+{
+class XStatusIndicator;
+}
+
+class BitmapEx;
+class SvStream;
+
 namespace vcl
 {
 class VCL_DLLPUBLIC PngImageReader
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 3dc5b4e2bff9..7e7842041dd6 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -10,13 +10,10 @@
 #ifndef INCLUDED_VCL_OPENGL_OPENGLCONTEXT_HXX
 #define INCLUDED_VCL_OPENGL_OPENGLCONTEXT_HXX
 
-#include <string.h>
-
 #include <epoxy/gl.h>
 
 #include <vcl/dllapi.h>
 #include <vcl/syschild.hxx>
-#include <rtl/crc.h>
 #include <rtl/ref.hxx>
 
 #include <memory>
diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx
index 9bc8b5c9bf2d..f39661461d99 100644
--- a/include/vcl/task.hxx
+++ b/include/vcl/task.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_TASK_HXX
 
 #include <vcl/dllapi.h>
-#include <sal/log.hxx>
 
 struct ImplSchedulerData;
 
diff --git a/include/vcl/toolkit/group.hxx b/include/vcl/toolkit/group.hxx
index 5d8ce8944813..5a71c2527b2e 100644
--- a/include/vcl/toolkit/group.hxx
+++ b/include/vcl/toolkit/group.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_GROUP_HXX
 #define INCLUDED_VCL_GROUP_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/ctrl.hxx>
 
diff --git a/include/vcl/toolkit/morebtn.hxx b/include/vcl/toolkit/morebtn.hxx
index 4243a1438045..09c6bd6be98c 100644
--- a/include/vcl/toolkit/morebtn.hxx
+++ b/include/vcl/toolkit/morebtn.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_VCL_MOREBTN_HXX
 #define INCLUDED_VCL_MOREBTN_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
-#include <vcl/mapmod.hxx>
 #include <vcl/button.hxx>
 #include <memory>
 
diff --git a/include/vcl/toolkit/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx
index 2146f27d3e19..29c7f3ea794e 100644
--- a/include/vcl/toolkit/unowrap.hxx
+++ b/include/vcl/toolkit/unowrap.hxx
@@ -22,16 +22,10 @@
 
 #include <com/sun/star/uno/Reference.h>
 #include <vcl/dllapi.h>
+#include <vcl/vclptr.hxx>
 
-class XWindowPeer;
-class XToolkit;
-class EventList;
 namespace vcl { class Window; }
 class OutputDevice;
-class MouseEvent;
-class CommandEvent;
-class KeyEvent;
-namespace tools { class Rectangle; }
 class Menu;
 
 namespace com {
@@ -43,9 +37,6 @@ namespace awt {
     class XWindow;
     class XWindowPeer;
 }
-namespace lang {
-    class XMultiServiceFactory;
-}
 } } }
 
 namespace com {
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index 0c32b71d5197..c1d2db0bf152 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_VCL_VCLLAYOUT_HXX
 #define INCLUDED_VCL_VCLLAYOUT_HXX
 
-#include <memory>
-
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <tools/gen.hxx>
 #include <vcl/devicecoordinate.hxx>
@@ -33,11 +31,6 @@ class SalGraphics;
 struct GlyphItem;
 class SalLayoutGlyphs;
 
-namespace vcl
-{
-    class TextLayoutCache;
-}
-
 // all positions/widths are in font units
 // one exception: drawposition is in pixel units
 
diff --git a/include/vcl/waitobj.hxx b/include/vcl/waitobj.hxx
index 15f4bdd29738..a136a73b455a 100644
--- a/include/vcl/waitobj.hxx
+++ b/include/vcl/waitobj.hxx
@@ -22,11 +22,12 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/window.hxx>
-#include <vcl/weld.hxx>
 
 #include <stack>
 #include <vector>
 
+namespace weld { class Window; }
+
 class VCL_DLLPUBLIC WaitObject
 {
 private:
diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index fd5100860cb3..c6e8e863be3c 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -25,7 +25,6 @@
 #include <vcl/dllapi.h>
 #include <o3tl/cow_wrapper.hxx>
 
-class Color;
 class Gradient;
 class BitmapEx;
 class ImplWallpaper;