tdf#42949 Fix IWYU warnings in include/vcl/[f-h]*

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

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

109 files changed, 156 insertions, 64 deletions

diff --git a/accessibility/inc/helper/characterattributeshelper.hxx b/accessibility/inc/helper/characterattributeshelper.hxx
index 50e36902eae1..ba18d37e9137 100644
--- a/accessibility/inc/helper/characterattributeshelper.hxx
+++ b/accessibility/inc/helper/characterattributeshelper.hxx
@@ -25,6 +25,7 @@
 #include <vcl/font.hxx>
 
 #include <map>
+#include <vector>
 
 
 // class CharacterAttributesHelper
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index cfea56ae6702..6aef236e50a3 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -34,6 +34,7 @@
 #include <svl/stritem.hxx>
 #include <svl/srchdefs.hxx>
 #include <vcl/weld.hxx>
+#include <tools/stream.hxx>
 
 namespace basctl
 {
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index 4f5b2649a122..b1a9f61275f9 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -24,6 +24,7 @@
 #include <canvas/canvastools.hxx>
 #include <rtl/instance.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/stream.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/dibtools.hxx>
 
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index eb9dd0972b98..a31f1af7f24c 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -23,6 +23,7 @@
 #include <canvas/canvastools.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/dibtools.hxx>
+#include <tools/stream.hxx>
 
 #include "canvasbitmap.hxx"
 #include "spritecanvas.hxx"
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index fbc55d2f2181..2c0e06de80e7 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -16,6 +16,8 @@
 #include <test/unoapi_test.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/pngwrite.hxx>
+#include <vcl/gdimtf.hxx>
+#include <tools/stream.hxx>
 
 using namespace com::sun::star;
 
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index 00b28434651a..6340c0c8c9e2 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -11,6 +11,7 @@
 #include <FontFeaturesDialog.hxx>
 #include <vcl/font/FeatureParser.hxx>
 #include <svx/dialmgr.hxx>
+#include <unordered_set>
 
 using namespace css;
 
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 319b8d338ae7..243e21dd117d 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -41,6 +41,7 @@
 #include <sal/log.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
+#include <tools/stream.hxx>
 #include <svl/urihelper.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 474cb0e9c4dd..685b6f9db6f2 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/stream.hxx>
+#include <tools/debug.hxx>
 #include <sal/log.hxx>
 #include "cfgchart.hxx"
 #include <dialmgr.hxx>
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index f199ab2082cb..3f496bee5db1 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -19,6 +19,7 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/stream.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/fixedhyper.hxx>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 324f24e37970..257925d71cfa 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -115,6 +115,7 @@
 #include <svl/eitem.hxx>
 #include <basic/sbstar.hxx>
 #include <desktop/crashreport.hxx>
+#include <tools/urlobj.hxx>
 
 #include <svtools/fontsubstconfig.hxx>
 #include <svtools/accessibilityoptions.hxx>
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 3b5128f99255..3a45f302cc6b 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -46,6 +46,7 @@
 #include <o3tl/make_unique.hxx>
 #include <sal/log.hxx>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/hatch.hxx>
 #include <emfplushelper.hxx>
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index d96fa16b0901..f50d98d5522a 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -43,6 +43,7 @@
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <tools/mapunit.hxx>
+#include <tools/stream.hxx>
 #include <unotools/configmgr.hxx>
 #include <libxml/xmlwriter.h>
 #include <editeng/unonrule.hxx>
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 611b59226f40..d669fd6dc074 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -31,6 +31,7 @@
 #include <editeng/memberids.h>
 #include <svl/itempool.hxx>
 #include <vcl/unohelp.hxx>
+#include <tools/gen.hxx>
 
 #include <editeng/unofdesc.hxx>
 #include <editeng/svxfont.hxx>
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 9f88def3cbf6..5195b0ba7fcb 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -40,6 +40,7 @@
 #include <vcl/floatwin.hxx>
 #include <svtools/svmedit.hxx>
 #include <svtools/colorcfg.hxx>
+#include <svl/zforlist.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/datetime.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index 01d57088f28f..e9e29aa713f2 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -23,6 +23,7 @@
 #include "commoncontrol.hxx"
 #include <vcl/fmtfield.hxx>
 #include <svtools/fileurlbox.hxx>
+#include <svl/zforlist.hxx>
 #include "standardcontrol.hxx"
 
 class SvNumberFormatsSupplierObj;
diff --git a/filter/qa/unit/textfilterdetect.cxx b/filter/qa/unit/textfilterdetect.cxx
index 3711c416c2c5..63a309d85972 100644
--- a/filter/qa/unit/textfilterdetect.cxx
+++ b/filter/qa/unit/textfilterdetect.cxx
@@ -14,6 +14,7 @@
 #include <test/bootstrapfixture.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/streamwrap.hxx>
+#include <tools/stream.hxx>
 
 namespace com
 {
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 46f5d78bee45..d4f37bc3b1fa 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -18,12 +18,14 @@
  */
 
 
+#include <tools/stream.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <svl/solar.hrc>
 #include <vcl/fltcall.hxx>
 #include <vcl/FilterConfigItem.hxx>
+#include <com/sun/star/task/XStatusIndicator.hpp>
 #include "giflzwc.hxx"
 #include <memory>
 
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index b8568ede408d..618d5c00c610 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -41,6 +41,7 @@
 #include <vcl/weld.hxx>
 #include <strings.hrc>
 #include <osl/diagnose.h>
+#include <com/sun/star/task/XStatusIndicator.hpp>
 
 #include <math.h>
 #include <memory>
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index badcfff9f932..45366f52a7fd 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -18,12 +18,14 @@
  */
 
 
+#include <tools/stream.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <svl/solar.hrc>
 #include <vcl/fltcall.hxx>
 #include <vcl/FilterConfigItem.hxx>
+#include <com/sun/star/task/XStatusIndicator.hpp>
 
 #define NewSubfileType              254
 #define ImageWidth                  256
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index eb1faefe4ac2..182c948a8cf0 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -21,11 +21,13 @@
 #include <o3tl/safeint.hxx>
 #include <tools/poly.hxx>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include <sal/log.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/lineinfo.hxx>
+#include <vcl/gdimtf.hxx>
 
 #include <math.h>
 #include <algorithm>
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 5f88c398e975..14a7b4bf58e2 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -22,6 +22,7 @@
 #include <sal/log.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/gdimtf.hxx>
 #include <tools/poly.hxx>
 #include <tools/fract.hxx>
 #include <vcl/virdev.hxx>
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 151fbc3cb8ff..b5d6f7f7142f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -39,6 +39,7 @@
 #include <vcl/wrkwin.hxx>
 #include <tools/stream.hxx>
 #include <tools/zcodec.hxx>
+#include <tools/urlobj.hxx>
 #include <svx/svdopath.hxx>
 #include <stdlib.h>
 #include <vcl/graphicfilter.hxx>
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 88eccc7d2167..846f641ab5cc 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -36,6 +36,7 @@
 #include <vcl/weld.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <vcl/treelistentry.hxx>
+#include <tools/stream.hxx>
 
 #include <rtl/uri.hxx>
 
diff --git a/framework/qa/cppunit/dispatchtest.cxx b/framework/qa/cppunit/dispatchtest.cxx
index a09bdb99b0ed..b4b7851a3c56 100644
--- a/framework/qa/cppunit/dispatchtest.cxx
+++ b/framework/qa/cppunit/dispatchtest.cxx
@@ -17,6 +17,7 @@
 #include <com/sun/star/frame/XInterceptorInfo.hpp>
 
 #include <comphelper/processfactory.hxx>
+#include <rtl/ref.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx
index a7237ad9c3ec..e5622244070c 100644
--- a/framework/source/uielement/thesaurusmenucontroller.cxx
+++ b/framework/source/uielement/thesaurusmenucontroller.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <i18nlangtag/languagetag.hxx>
 #include <svl/lngmisc.hxx>
 #include <svtools/popupmenucontrollerbase.hxx>
 #include <unotools/lingucfg.hxx>
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 838faaf4258e..3c370c3bac2a 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -35,6 +35,8 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/toolbox.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/combobox.hxx>
 #include <svtools/miscopt.hxx>
 
 using namespace ::com::sun::star;
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index d802d6b26af9..17d57b5172ce 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -313,3 +313,9 @@ blacklist:
     include/vcl/event.hxx:
     # Needed for enum type 
     - vcl/window.hxx
+    include/vcl/fntstyle.hxx:
+    # Needed for template
+    - o3tl/typed_flags_set.hxx
+    include/vcl/help.hxx:
+    # Needed for template
+    - o3tl/typed_flags_set.hxx
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 68b13a311f36..07523577541e 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -32,6 +32,7 @@
 #include <tools/contnr.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/errcode.hxx>
 #include <tools/link.hxx>
 #include <svl/style.hxx>
 #include <editeng/editengdllapi.h>
diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx
index c99433a2c3f0..ef36e01dad73 100644
--- a/include/sfx2/opengrf.hxx
+++ b/include/sfx2/opengrf.hxx
@@ -21,6 +21,7 @@
 
 #include <memory>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/weld.hxx>
 #include <sfx2/dllapi.h>
 
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index 2cd352bc159d..0e9a7174d083 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <svx/svxdllapi.h>
+#include <rtl/ref.hxx>
 #include <map>
 #include <memory>
 
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index 9acd14c1ee58..f04c33e136bd 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -23,6 +23,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/GraphicObject.hxx>
+#include <rtl/ref.hxx>
 #include <vector>
 #include <set>
 #include <unordered_map>
diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx
index 5a02045da52f..09d55e3d8d51 100644
--- a/include/svx/xoutbmp.hxx
+++ b/include/svx/xoutbmp.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SVX_XOUTBMP_HXX
 
 #include <vcl/graph.hxx>
+#include <vcl/errcode.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <svx/svxdllapi.h>
diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx
index 878e423c823f..3abba38c862d 100644
--- a/include/vcl/FilterConfigItem.hxx
+++ b/include/vcl/FilterConfigItem.hxx
@@ -24,13 +24,14 @@
 #include <vcl/dllapi.h>
 
 #include <rtl/ustring.hxx>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
 
 class VCL_DLLPUBLIC FilterConfigItem
 {
diff --git a/include/vcl/GraphicExternalLink.hxx b/include/vcl/GraphicExternalLink.hxx
index 7a9cac258d30..ab9f2a69f4ca 100644
--- a/include/vcl/GraphicExternalLink.hxx
+++ b/include/vcl/GraphicExternalLink.hxx
@@ -10,8 +10,8 @@
 #ifndef INCLUDED_VCL_GRAPHIC_EXTERNAL_LINK_HXX
 #define INCLUDED_VCL_GRAPHIC_EXTERNAL_LINK_HXX
 
-#include <memory>
 #include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
 
 class VCL_DLLPUBLIC GraphicExternalLink
 {
diff --git a/include/vcl/GraphicNativeTransform.hxx b/include/vcl/GraphicNativeTransform.hxx
index 04bdf4817dd0..c8203377dc55 100644
--- a/include/vcl/GraphicNativeTransform.hxx
+++ b/include/vcl/GraphicNativeTransform.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_VCL_GRAPHICNATIVETRANSFORM_HXX
 #define INCLUDED_VCL_GRAPHICNATIVETRANSFORM_HXX
 
-#include <vcl/graph.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <vcl/dllapi.h>
+class Graphic;
 
 class VCL_DLLPUBLIC GraphicNativeTransform final
 {
diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx
index b30808e493f4..854cc14ec6fd 100644
--- a/include/vcl/GraphicObject.hxx
+++ b/include/vcl/GraphicObject.hxx
@@ -23,11 +23,9 @@
 #include <memory>
 #include <vcl/graph.hxx>
 #include <vcl/dllapi.h>
-#include <o3tl/typed_flags_set.hxx>
 
-#include <com/sun/star/graphic/XGraphic.hpp>
-
-#include <unordered_set>
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
+namespace o3tl { template <typename T> struct typed_flags; }
 
 enum class GraphicManagerDrawFlags
 {
@@ -64,9 +62,6 @@ enum class GraphicDrawMode
     Watermark = 3
 };
 
-class GraphicManager;
-class SvStream;
-class GraphicCache;
 class VirtualDevice;
 struct GrfSimpleCacheObj;
 struct ImplTileInfo;
diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx
index 632578072775..d43a7c0d2e75 100644
--- a/include/vcl/cvtgrf.hxx
+++ b/include/vcl/cvtgrf.hxx
@@ -23,6 +23,7 @@
 #include <vcl/dllapi.h>
 #include <tools/link.hxx>
 #include <vcl/salctype.hxx>
+#include <vcl/errcode.hxx>
 
 
 class   Graphic;
diff --git a/include/vcl/filter/pdfdocument.hxx b/include/vcl/filter/pdfdocument.hxx
index 3ec08020044a..a71596d00b74 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -15,8 +15,6 @@
 #include <map>
 #include <vector>
 
-#include <com/sun/star/uno/Reference.h>
-
 #include <tools/stream.hxx>
 
 #include <vcl/dllapi.h>
@@ -35,12 +33,25 @@ class XCertificate;
 }
 }
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+template <class interface_type> class Reference;
+}
+}
+}
+}
+
 namespace vcl
 {
 namespace filter
 {
 class PDFTrailerElement;
-class PDFHexStringElement;
 class PDFReferenceElement;
 class PDFDocument;
 class PDFDictionaryElement;
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 7873c58de340..2dcc8a4769e8 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -20,15 +20,12 @@
 #ifndef INCLUDED_VCL_FIXED_HXX
 #define INCLUDED_VCL_FIXED_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/bitmapex.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/image.hxx>
 
-class UserDrawEvent;
-
 
 class VCL_DLLPUBLIC FixedText : public Control
 {
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 7cb1e38b9914..aa6c6c0b3130 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_VCL_FLOATWIN_HXX
 #define INCLUDED_VCL_FLOATWIN_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/syswin.hxx>
-#include <o3tl/typed_flags_set.hxx>
 #include <memory>
 
+namespace o3tl { template <typename T> struct typed_flags; }
+
 class ToolBox;
 
 
diff --git a/include/vcl/fltcall.hxx b/include/vcl/fltcall.hxx
index 6d0b3d223f30..f10e72b0702a 100644
--- a/include/vcl/fltcall.hxx
+++ b/include/vcl/fltcall.hxx
@@ -19,16 +19,10 @@
 
 #ifndef INCLUDED_VCL_FLTCALL_HXX
 #define INCLUDED_VCL_FLTCALL_HXX
-#include <sal/types.h>
-#include <vcl/field.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <vcl/FilterConfigItem.hxx>
 
 class FilterConfigItem;
 class SvStream;
 class Graphic;
-namespace vcl { class Window; }
 
 typedef bool (*PFilterCall)(SvStream & rStream, Graphic & rGraphic,
                             FilterConfigItem* pConfigItem);
diff --git a/include/vcl/fmtfield.hxx b/include/vcl/fmtfield.hxx
index de1a090036f7..287146a62e6f 100644
--- a/include/vcl/fmtfield.hxx
+++ b/include/vcl/fmtfield.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_VCL_FMTFIELD_HXX
 #define INCLUDED_VCL_FMTFIELD_HXX
 
-#include <svtools/svtdllapi.h>
 #include <vcl/spinfld.hxx>
-#include <svl/zforlist.hxx>
 #include <memory>
 
+class SvNumberFormatter;
+
 namespace validation { class NumberValidator; }
 
 enum class FORMAT_CHANGE_TYPE
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index 02dab4d8b51e..7c9fc436acd1 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -23,13 +23,14 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <vcl/dllapi.h>
-#include <i18nlangtag/languagetag.hxx>
 #include <tools/color.hxx>
-#include <tools/gen.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
+#include <i18nlangtag/lang.h>
 #include <vcl/fntstyle.hxx>
 #include <o3tl/cow_wrapper.hxx>
 
+class Size;
+class LanguageTag;
 class SvStream;
 #define FontAlign TextAlign
 
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index 299d0a55a9f2..85e0d1bcfd0d 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -12,10 +12,7 @@
 
 #include <vcl/dllapi.h>
 #include <rtl/ustring.hxx>
-#include <rtl/string.hxx>
-#include <memory>
 #include <vector>
-#include <unordered_map>
 
 namespace vcl
 {
diff --git a/include/vcl/font/FeatureParser.hxx b/include/vcl/font/FeatureParser.hxx
index 3adc5fc0b0d0..37e8b0d6196d 100644
--- a/include/vcl/font/FeatureParser.hxx
+++ b/include/vcl/font/FeatureParser.hxx
@@ -12,11 +12,8 @@
 
 #include <vcl/dllapi.h>
 #include <rtl/ustring.hxx>
-#include <rtl/string.hxx>
-#include <memory>
 #include <vector>
 #include <unordered_map>
-#include <vcl/font/Feature.hxx>
 
 namespace vcl
 {
diff --git a/include/vcl/fontcapabilities.hxx b/include/vcl/fontcapabilities.hxx
index 165a964eb93b..51aa13e58ade 100644
--- a/include/vcl/fontcapabilities.hxx
+++ b/include/vcl/fontcapabilities.hxx
@@ -11,11 +11,8 @@
 #define INCLUDED_VCL_FONTCAPABILITIES_HXX
 
 #include <boost/optional.hpp>
-#include <vector>
 #include <bitset>
 
-#include <sal/types.h>
-
 //See OS/2 table, i.e. http://www.microsoft.com/typography/otspec/os2.htm#ur
 namespace vcl
 {
diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx
index 15f08abac937..eeb8367ced6c 100644
--- a/include/vcl/fontcharmap.hxx
+++ b/include/vcl/fontcharmap.hxx
@@ -21,11 +21,12 @@
 #define INCLUDED_FONTCHARMAP_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/font.hxx>
-#include <vcl/outdev.hxx>
+#include <tools/ref.hxx>
 
 class ImplFontCharMap;
 class CmapResult;
+class FontCharMap;
+class OutputDevice;
 
 typedef sal_uInt32 sal_UCS4;
 typedef tools::SvRef<ImplFontCharMap> ImplFontCharMapRef;
diff --git a/include/vcl/gdimetafiletools.hxx b/include/vcl/gdimetafiletools.hxx
index 2ae2c1dcdb45..258b8c9a2996 100644
--- a/include/vcl/gdimetafiletools.hxx
+++ b/include/vcl/gdimetafiletools.hxx
@@ -19,7 +19,8 @@
 #ifndef INCLUDED_VCL_GDIMETAFILETOOLS_HXX
 #define INCLUDED_VCL_GDIMETAFILETOOLS_HXX
 
-#include <vcl/gdimtf.hxx>
+#include <vcl/dllapi.h>
+class GDIMetaFile;
 
 
 // #i121267# Added tooling to be able to support old exporters which are based on
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index a9dc49dccb1e..7f89c1019eb5 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -29,7 +29,6 @@
 
 class OutputDevice;
 class MetaAction;
-class MetaCommentAction;
 class SvStream;
 class Color;
 class BitmapEx;
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 38289d465c3b..b595023efeb5 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -22,7 +22,6 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/mapmod.hxx>
 #include <memory>
diff --git a/include/vcl/glyphitem.hxx b/include/vcl/glyphitem.hxx
index 83625371fb3b..7634bd3a4413 100644
--- a/include/vcl/glyphitem.hxx
+++ b/include/vcl/glyphitem.hxx
@@ -20,9 +20,11 @@
 #ifndef INCLUDED_VCL_GLYPHITEM_HXX
 #define INCLUDED_VCL_GLYPHITEM_HXX
 
+#include <sal/types.h>
+#include <vcl/dllapi.h>
+
 typedef sal_uInt16 sal_GlyphId;
 
-struct GlyphItem;
 class SalLayoutGlyphsImpl;
 
 class VCL_DLLPUBLIC SalLayoutGlyphs final
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 3b91a3269478..3b3e280ebd8c 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -21,14 +21,11 @@
 #define INCLUDED_VCL_GRAPH_HXX
 
 #include <memory>
-#include <tools/stream.hxx>
 #include <vcl/dllapi.h>
 #include <tools/solar.h>
 #include <rtl/ustring.hxx>
-#include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/animate.hxx>
-#include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <vcl/vectorgraphicdata.hxx>
@@ -47,7 +44,9 @@ enum class GraphicType
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphic;} } } }
 namespace vcl { class Font; }
 
-class GfxLink;
+class Bitmap;
+class GDIMetaFile;
+class SvStream;
 class ImpGraphic;
 class OutputDevice;
 class ReaderData;
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index fe084136ce5a..8152dbc972b1 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -21,17 +21,18 @@
 #define INCLUDED_VCL_GRAPHICFILTER_HXX
 
 #include <tools/gen.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/field.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/errcode.hxx>
-#include <o3tl/typed_flags_set.hxx>
 
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace o3tl { template <typename T> struct typed_flags; }
+
+class INetURLObject;
+
 class FilterConfigCache;
 class SvStream;
 struct WmfExternal;
diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index 01f1e7ae8fda..1c4df9900d2b 100644
--- a/include/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
@@ -22,12 +22,10 @@
 
 #include <vcl/dllapi.h>
 #include <sal/types.h>
-#include <rtl/string.hxx>
 #include <tools/color.hxx>
 #include <tools/poly.hxx>
 #include <vcl/graph.hxx>
 
-#include <memory>
 #include <vector>
 
 class SvStream;
diff --git a/include/vcl/headbar.hxx b/include/vcl/headbar.hxx
index af6c99a56625..9d53cc50b11a 100644
--- a/include/vcl/headbar.hxx
+++ b/include/vcl/headbar.hxx
@@ -171,7 +171,6 @@ HeaderBarItemBits::CLICKABLE, but HeaderBarItemBits::FIXEDPOS.
 
 *************************************************************************/
 
-class Accelerator;
 class ImplHeadItem;
 
 #define WB_BOTTOMBORDER         (WinBits(0x0400))
@@ -209,8 +208,6 @@ namespace o3tl
 
 #define HEADERBAR_TEXTOFF           2
 
-class VCLXHeaderBar;
-
 
 class VCL_DLLPUBLIC HeaderBar : public vcl::Window
 {
diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx
index 768d4d03cbe1..b6cb583604d5 100644
--- a/include/vcl/help.hxx
+++ b/include/vcl/help.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_HELP_HXX
 
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/include/vcl/imapcirc.hxx b/include/vcl/imapcirc.hxx
index f021f7ddffde..eed22b2d5e06 100644
--- a/include/vcl/imapcirc.hxx
+++ b/include/vcl/imapcirc.hxx
@@ -21,6 +21,7 @@
 
 #include <vcl/dllapi.h>
 #include <tools/gen.hxx>
+#include <tools/solar.h>
 #include <vcl/imapobj.hxx>
 
 class Fraction;
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 749146eb40d8..cd961420261b 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <cstddef>
+#include <vector>
 
 #include <vcl/dllapi.h>
 #include <vcl/vclptr.hxx>
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index f1342ccce8ae..6151785f5480 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -32,6 +32,7 @@
 class ImplLayoutArgs;
 class PhysicalFontFace;
 class SalGraphics;
+struct GlyphItem;
 namespace vcl
 {
     class TextLayoutCache;
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx
index 83a7be3f2fda..2fb3b400d000 100644
--- a/sax/qa/cppunit/parser.cxx
+++ b/sax/qa/cppunit/parser.cxx
@@ -17,6 +17,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <sax/fastparser.hxx>
 #include <test/bootstrapfixture.hxx>
+#include <rtl/ref.hxx>
 
 using namespace css;
 using namespace css::xml::sax;
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index dfcd778b6924..6e011c1e971b 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -47,6 +47,7 @@
 #include <stack>
 #include <deque>
 #include <sax/fastparser.hxx>
+#include <rtl/ref.hxx>
 
 
 namespace {
diff --git a/sc/source/ui/dataprovider/csvdataprovider.cxx b/sc/source/ui/dataprovider/csvdataprovider.cxx
index ec2f83906d5d..034f8bef024d 100644
--- a/sc/source/ui/dataprovider/csvdataprovider.cxx
+++ b/sc/source/ui/dataprovider/csvdataprovider.cxx
@@ -12,6 +12,7 @@
 #include <datamapper.hxx>
 #include <stringutil.hxx>
 
+#include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <docsh.hxx>
 #include <orcus/csv_parser.hpp>
diff --git a/sc/source/ui/dataprovider/dataprovider.cxx b/sc/source/ui/dataprovider/dataprovider.cxx
index f135aed4657a..4f20bd4e719b 100644
--- a/sc/source/ui/dataprovider/dataprovider.cxx
+++ b/sc/source/ui/dataprovider/dataprovider.cxx
@@ -15,6 +15,7 @@
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <unotools/charclass.hxx>
+#include <tools/stream.hxx>
 
 #include "htmldataprovider.hxx"
 #include "xmldataprovider.hxx"
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index a8ad9df0a16d..ab7c55a30087 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/presentation/XCustomPresentationSupplier.hpp>
 #include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <tools/zcodec.hxx>
 #include <editeng/svxenum.hxx>
 #include <sot/storinfo.hxx>
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 3642629a936b..bceacfac8ca3 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -65,6 +65,7 @@
 #include <com/sun/star/text/XSimpleText.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <editeng/svxenum.hxx>
 #include <editeng/flditem.hxx>
 #include <sot/storinfo.hxx>
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 48e262ec2280..8596859f791f 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -54,6 +54,7 @@
 
 #include <cassert>
 #include <rtl/ustring.hxx>
+#include <rtl/ref.hxx>
 
 using namespace ::pdfparse;
 using namespace ::pdfi;
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index b2d9d8a37b61..fba3d944c225 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -30,6 +30,7 @@
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/gdimtf.hxx>
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/app.hxx>
 #include <vcl/graph.hxx>
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 99c2ad2b1cd6..7c7a2ebe6c1b 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -25,6 +25,7 @@
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <svtools/DocumentToGraphicRenderer.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index 0b275beed358..c42ad377b7d2 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -23,6 +23,7 @@
 
 #include <FltCallDialogParameter.hxx>
 #include <vcl/weld.hxx>
+#include <tools/stream.hxx>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 2a247d2b9dac..fdf904a6d2fd 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -20,6 +20,7 @@
 
 #include <svtools/embedhlp.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/gdimtf.hxx>
 #include <bitmaps.hlst>
 
 #include <sal/log.hxx>
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 9882a7dc98e3..39e0fb4bee3a 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -29,6 +29,7 @@
 #include <svtools/embedtransfer.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/gdimtf.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/storagehelper.hxx>
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index a94d9ede4c33..a7e991683938 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -22,6 +22,7 @@
 #include <vcl/fixedhyper.hxx>
 #include <vcl/prgsbar.hxx>
 #include <vcl/svapp.hxx>
+#include <svl/zforlist.hxx>
 #include <svtools/svmedit.hxx>
 #include <unoiface.hxx>
 #include <svtools/filectrl.hxx>
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 5089d7439356..68b988f2c0a5 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -22,6 +22,7 @@
 
 #include <tools/urlobj.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/gdimtf.hxx>
 #include <svx/galmisc.hxx>
 
 #define S_THUMB 80
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 8946bc010d7a..18d105fc5b1d 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -61,6 +61,7 @@
 #include <svtools/calendar.hxx>
 #include <vcl/fmtfield.hxx>
 #include <svl/numuno.hxx>
+#include <svl/zforlist.hxx>
 #include <svtools/svmedit.hxx>
 #include <svx/dialmgr.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 3e66c0ae1f26..64367526b458 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/task/XInteractionContinuation.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
+#include <tools/urlobj.hxx>
 #include <comphelper/interaction.hxx>
 #include <framework/interaction.hxx>
 #include <com/sun/star/drawing/GraphicFilterRequest.hpp>
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index c5c2b0316a3a..63be38408e56 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -24,6 +24,7 @@
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/gdimtf.hxx>
 #include <vcl/wmf.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/urihelper.hxx>
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 8749367ac965..822597dd246f 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -54,6 +54,7 @@
 
 #include <vcl/graphicfilter.hxx>
 #include <vcl/wmf.hxx>
+#include <vcl/gdimtf.hxx>
 
 #include "ww8scan.hxx"
 #include "ww8par.hxx"
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 37caae8f406d..0457e9bf13c1 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -50,6 +50,7 @@
 #include <unomod.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/asiancfg.hxx>
+#include <tools/stream.hxx>
 
 #include <swmodule.hxx>
 #include <cfgitems.hxx>
diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx
index 7028f1f88619..9385add57278 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -20,6 +20,7 @@
 #include <vcl/pngwrite.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/configmgr.hxx>
+#include <tools/stream.hxx>
 
 
 namespace {
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index 4277a72c83ba..df0b9543d632 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -21,6 +21,7 @@
 #include <memory>
 #include <toolkit/helper/formpdfexport.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/lineend.hxx>
 #include <unordered_map>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index a423a17081e8..cca60f0c6b4c 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -16,6 +16,7 @@
 #include <comphelper/fileformat.h>
 
 #include <vcl/graphicfilter.hxx>
+#include <tools/stream.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
index b61d10096da5..aa74eebf3ed3 100644
--- a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
@@ -13,6 +13,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <bitmapwriteaccess.hxx>
+#include <tools/stream.hxx>
 
 static OUString const gaDataUrl("/vcl/qa/cppunit/jpeg/data/");
 
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index eeba046c39ef..b42c1f158a9f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -30,6 +30,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/time.hxx>
+#include <tools/stream.hxx>
 
 #include <i18nlangtag/mslangid.hxx>
 
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index 0eedb63b408d..aa86faceddcd 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -27,7 +27,10 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/task/XStatusIndicator.hpp>
 
 using namespace ::com::sun::star::lang      ;   // XMultiServiceFactory
 using namespace ::com::sun::star::beans     ;   // PropertyValue
diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx b/vcl/source/filter/GraphicNativeMetadata.cxx
index 3132eef43ada..e42669d3c4aa 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -20,6 +20,7 @@
 #include <vcl/GraphicNativeMetadata.hxx>
 
 #include <vcl/gfxlink.hxx>
+#include <tools/stream.hxx>
 
 #include "jpeg/Exif.hxx"
 #include <memory>
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index db4a1078a70d..9d1941f8fae6 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -23,6 +23,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <tools/stream.hxx>
 
 #include "jpeg/Exif.hxx"
 #include "jpeg/JpegTransform.hxx"
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index b3fce62c75f0..b79d4afa425c 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <tools/stream.hxx>
 #include <tools/fract.hxx>
+#include <tools/urlobj.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 3d1b191c798f..22b916ca0198 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/log.hxx>
+#include <tools/stream.hxx>
 #include "decode.hxx"
 #include "gifread.hxx"
 #include <memory>
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index 7e952968e393..844b325f5ede 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <sal/config.h>
+#include <tools/stream.hxx>
 
 #include <rtl/character.hxx>
 #include <bitmapwriteaccess.hxx>
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index c31d83a4a82f..dd1166a20caa 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -20,6 +20,7 @@
 #include <vcl/bitmapaccess.hxx>
 #include <bitmapwriteaccess.hxx>
 #include <vcl/graph.hxx>
+#include <tools/stream.hxx>
 #include "rgbtable.hxx"
 #include "xpmread.hxx"
 #include <cstring>
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 725ebe1ae27e..ab2e83f20060 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -19,6 +19,7 @@
 
 #include "Exif.hxx"
 #include <memory>
+#include <tools/stream.hxx>
 
 Exif::Exif() :
     maOrientation(TOP_LEFT),
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index 1e21b012f0d9..ba71938dc1ad 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -27,7 +27,9 @@
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/outdev.hxx>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include <memory>
 
 #define BUFFER_SIZE  4096
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index f246c3ea53b3..643b63247513 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -28,6 +28,7 @@
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <tools/stream.hxx>
 
 #define BUFFER_SIZE  4096
 
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index d03b6448a249..52d86c92b188 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -26,6 +26,7 @@
 #include <rtl/strbuf.hxx>
 #include <tools/helpers.hxx>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <vcl/lineinfo.hxx>
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 1e93721f9992..f787401fba1b 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -32,9 +32,11 @@
 #include <tools/helpers.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include <osl/endian.h>
 #include <vcl/dibtools.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/FilterConfigItem.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <memory>
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index e0aeba713ac4..acbc3e74beaf 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -25,6 +25,8 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/fltcall.hxx>
+#include <com/sun/star/task/XStatusIndicator.hpp>
+#include <tools/stream.hxx>
 
 #define MAXOBJECTHANDLES 16
 
diff --git a/vcl/source/font/FeatureParser.cxx b/vcl/source/font/FeatureParser.cxx
index 7085b94f19ef..abfda4b0734d 100644
--- a/vcl/source/font/FeatureParser.cxx
+++ b/vcl/source/font/FeatureParser.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <vcl/font/FeatureParser.hxx>
+#include <vcl/font/Feature.hxx>
 
 namespace vcl
 {
diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx
index 50204c1d5666..d7ee76ff1f89 100644
--- a/vcl/source/gdi/cvtgrf.cxx
+++ b/vcl/source/gdi/cvtgrf.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/metaact.hxx>
 #include <vcl/cvtgrf.hxx>
+#include <tools/stream.hxx>
 
 #include <salinst.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx
index 77689140c863..14a5492e36c3 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -27,6 +27,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/graphictools.hxx>
 #include <osl/diagnose.h>
+#include <tools/stream.hxx>
 
 // helpers
 
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 0624bee326ef..f41b743cbaaf 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -28,6 +28,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <tools/stream.hxx>
 
 #include <set>
 #include <memory>
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 7ba9a79b5376..80c130a2f9e1 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -41,6 +41,7 @@
 #include <vcl/wall.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <comphelper/hash.hxx>
+#include <tools/stream.hxx>
 
 #include <sallayout.hxx>
 #include <outdata.hxx>
diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx
index 66b4f6fd9b6f..cbfd8a84f4d5 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -38,6 +38,7 @@
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 #include <memory>
 
 
diff --git a/vcl/source/graphic/UnoGraphic.cxx b/vcl/source/graphic/UnoGraphic.cxx
index 45225261f836..970a904519d8 100644
--- a/vcl/source/graphic/UnoGraphic.cxx
+++ b/vcl/source/graphic/UnoGraphic.cxx
@@ -19,6 +19,7 @@
 
 #include <graphic/UnoGraphic.hxx>
 
+#include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/graphic/GraphicType.hpp>
 #include <com/sun/star/graphic/XGraphicTransformer.hpp>
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index b2a70ed7064b..588ae70cabe0 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -16,6 +16,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
+#include <tools/stream.hxx>
 #include <config_folders.h>
 #include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index d98773cd95bd..a0879f503b51 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -20,6 +20,7 @@
 #include <cassert>
 
 #include <tools/line.hxx>
+#include <tools/stream.hxx>
 
 #include <vcl/hatch.hxx>
 #include <vcl/metaact.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 79035ab6d629..5c3cdf64fc53 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -27,6 +27,7 @@
 #include <comphelper/processfactory.hxx>
 #include <osl/file.h>
 #include <sal/log.hxx>
+#include <tools/lineend.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/textrectinfo.hxx>
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index cbd736efe6ad..beedf86fe7f0 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -44,6 +44,8 @@
 #include <vcl/fltcall.hxx>
 #include <osl/file.hxx>
 #include <osl/module.hxx>
+#include <tools/stream.hxx>
+#include <vcl/gdimtf.hxx>
 
 #include "../source/filter/igif/gifread.hxx"
 #include "../source/filter/ixbm/xbmread.hxx"
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 5f6743a52966..4d0ef7dbb5e1 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -30,6 +30,7 @@
 #include <cppuhelper/bootstrap.hxx>
 #include <osl/file.hxx>
 #include <sal/log.hxx>
+#include <tools/stream.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx b/writerperfect/source/writer/EPUBExportFilter.cxx
index 49dee6bce595..695265be579c 100644
--- a/writerperfect/source/writer/EPUBExportFilter.cxx
+++ b/writerperfect/source/writer/EPUBExportFilter.cxx
@@ -24,6 +24,8 @@
 #include <comphelper/propertysetinfo.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <svtools/DocumentToGraphicRenderer.hxx>
+#include <vcl/gdimtf.hxx>
+#include <tools/stream.hxx>
 
 #include "exp/xmlimp.hxx"
 #include "EPUBPackage.hxx"