tdf#42949 Fix IWYU warnings in include/vcl/[n-r]*

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

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

34 files changed, 59 insertions, 59 deletions

diff --git a/drawinglayer/inc/wmfemfhelper.hxx b/drawinglayer/inc/wmfemfhelper.hxx
index 2af7cce6904d..d88a6385fc26 100644
--- a/drawinglayer/inc/wmfemfhelper.hxx
+++ b/drawinglayer/inc/wmfemfhelper.hxx
@@ -25,6 +25,7 @@
 #include <vcl/font.hxx>
 #include <vcl/outdevstate.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <memory>
 
 // predefines
diff --git a/drawinglayer/source/processor2d/processor2dtools.cxx b/drawinglayer/source/processor2d/processor2dtools.cxx
index 9d7e1aed245c..1149e5271b9e 100644
--- a/drawinglayer/source/processor2d/processor2dtools.cxx
+++ b/drawinglayer/source/processor2d/processor2dtools.cxx
@@ -18,6 +18,7 @@
  */
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <o3tl/make_unique.hxx>
+#include <vcl/gdimtf.hxx>
 #include "vclpixelprocessor2d.hxx"
 #include "vclmetafileprocessor2d.hxx"
 
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 8b372cf752cf..ea069da20b75 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
 #include <com/sun/star/security/XCertificate.hpp>
+#include <com/sun/star/beans/XMaterialHolder.hpp>
 
 static OUString PDFFilterResId(const char* pId)
 {
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 88f212fbb609..2f788b9b3539 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -72,6 +72,8 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/security/XCertificate.hpp>
+#include <com/sun/star/beans/XMaterialHolder.hpp>
 
 #include <memory>
 
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 3d6389e633f3..0615d343c09d 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -326,4 +326,11 @@ blacklist:
     # Needed for macros
     - com/sun/star/awt/Key.hpp
     - com/sun/star/awt/KeyGroup.hpp
-
+    include/vcl/outdevstate.hxx:
+    # Full definition needed for boost::optional
+    - vcl/mapmod.hxx
+    - tools/color.hxx
+    - tools/gen.hxx
+    include/vcl/prntypes.hxx:
+    # Needed for macro
+    - tools/solar.h
diff --git a/include/vcl/NotebookbarContextControl.hxx b/include/vcl/NotebookbarContextControl.hxx
index b338d8dd3e57..ce557c54904f 100644
--- a/include/vcl/NotebookbarContextControl.hxx
+++ b/include/vcl/NotebookbarContextControl.hxx
@@ -12,8 +12,6 @@
 
 #include <vcl/EnumContext.hxx>
 
-class NotebookBar;
-
 class NotebookbarContextControl
 {
 public:
diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index 1e9ab288d9b4..4a031753609a 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -12,11 +12,11 @@
 
 #include <vcl/builder.hxx>
 #include <vcl/ctrl.hxx>
-#include <vcl/EnumContext.hxx>
-#include <vcl/NotebookbarContextControl.hxx>
-#include <com/sun/star/ui/XContextChangeEventListener.hpp>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace ui { class XContextChangeEventListener; } } } }
+
+class NotebookbarContextControl;
 class SystemWindow;
 
 /// This implements Widget Layout-based notebook-like menu bar.
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index a7b227a687e8..b17ada7e343e 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -15,22 +15,16 @@
 #include <epoxy/gl.h>
 
 #include <vcl/dllapi.h>
-#include <vcl/window.hxx>
-#include <tools/gen.hxx>
 #include <vcl/syschild.hxx>
 #include <rtl/crc.h>
 #include <rtl/ref.hxx>
 
-#include <map>
 #include <memory>
-#include <set>
 #include <unordered_map>
 
 class OpenGLFramebuffer;
 class OpenGLProgram;
 class OpenGLTexture;
-class SalGraphicsImpl;
-class OpenGLTests;
 class RenderState;
 
 /// Holds the information of our new child window
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 1502fc5d1ebb..9475aeb09355 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -11,11 +11,12 @@
 #define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
 
 #include <epoxy/gl.h>
-#include <sal/log.hxx>
+#include <sal/detail/log.h>
 #include <vcl/dllapi.h>
 #include <vcl/bitmapex.hxx>
 
 #include <rtl/ustring.hxx>
+#include <sstream>
 
 /// Helper to do a SAL_INFO as well as a GL log.
 #define VCL_GL_INFO(stream) \
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 81c47e63c7c6..0d6b80eb6bc2 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -31,7 +31,6 @@
 #include <vcl/devicecoordinate.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
-#include <vcl/glyphitem.hxx>
 #include <vcl/region.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/wall.hxx>
@@ -55,7 +54,6 @@
 
 struct ImplOutDevData;
 class LogicalFontInstance;
-class OutDevState;
 struct SystemGraphicsData;
 struct SystemFontData;
 struct SystemTextLayoutData;
@@ -68,7 +66,6 @@ class SalGraphics;
 class Gradient;
 class Hatch;
 class AllSettings;
-class Bitmap;
 class BitmapReadAccess;
 class BitmapEx;
 class Image;
@@ -86,35 +83,26 @@ class SalLayout;
 class ImplLayoutArgs;
 class VirtualDevice;
 struct SalTwoRect;
-class VirtualDevice;
 class Printer;
-class FontSelectPattern;
 class VCLXGraphics;
 class OutDevStateStack;
-struct BitmapSystemData;
+class SalLayoutGlyphs;
 
 namespace vcl
 {
-    class PDFWriterImpl;
     class ExtOutDevData;
     class ITextLayout;
     struct FontCapabilities;
     class TextLayoutCache;
     class Window;
-    class FontInfo;
     namespace font {
         struct Feature;
     }
 }
 
-namespace com { namespace sun { namespace star { namespace rendering {
-    class XCanvas;
-}}}}
-
 namespace basegfx {
     class B2DHomMatrix;
     class B2DPolygon;
-    class B2DPolyPolygon;
     class B2IVector;
     typedef B2IVector B2ISize;
 }
diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index d1f1ff6726b9..d3c469eff513 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -21,18 +21,18 @@
 #define INCLUDED_VCL_OUTDEVSTATE_HXX
 
 #include <vcl/mapmod.hxx>
-#include <vcl/region.hxx>
-#include <vcl/font.hxx>
 #include <vcl/vclenum.hxx>
 
-#include <tools/solar.h>
+#include <tools/color.hxx>
 #include <tools/gen.hxx>
 #include <tools/fontenum.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 #include <boost/optional.hpp>
+#include <i18nlangtag/lang.h>
 
-class Color;
+namespace vcl { class Font; }
+namespace vcl { class Region; }
 
 // Flags for OutputDevice::Push() and OutDevState
 enum class PushFlags {
diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index fa218655cb0c..4c54b7efcfb0 100644
--- a/include/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
@@ -24,14 +24,11 @@
 
 #include <vcl/pdfwriter.hxx>
 #include <vcl/extoutdevdata.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/mapmod.hxx>
 #include <vector>
 #include <memory>
 
 class Graphic;
-
-namespace vcl { class PDFWriter; }
+class GDIMetaFile;
 
 namespace vcl
 {
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 3029202f959a..c8cd7ec0af03 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -26,23 +26,20 @@
 #include <rtl/strbuf.hxx>
 
 #include <vcl/dllapi.h>
-#include <vcl/vclenum.hxx>
 #include <vcl/font.hxx>
-#include <vcl/graphictools.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/graph.hxx>
 
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/beans/XMaterialHolder.hpp>
-#include <com/sun/star/security/XCertificate.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
 #include <memory>
 #include <vector>
 #include <set>
 
-namespace vcl { class Font; }
-class Point;
-class OutputDevice;
+namespace com { namespace sun { namespace star { namespace beans { class XMaterialHolder; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
+namespace com { namespace sun { namespace star { namespace security { class XCertificate; } } } }
+
 class GDIMetaFile;
 class MapMode;
 class LineInfo;
@@ -52,7 +49,6 @@ namespace tools {
 }
 class Bitmap;
 class BitmapEx;
-class Image;
 class Gradient;
 class Hatch;
 class Wallpaper;
diff --git a/include/vcl/pngwrite.hxx b/include/vcl/pngwrite.hxx
index fe1b2c3e412d..4aa49244df36 100644
--- a/include/vcl/pngwrite.hxx
+++ b/include/vcl/pngwrite.hxx
@@ -20,13 +20,16 @@
 #ifndef INCLUDED_VCL_PNGWRITE_HXX
 #define INCLUDED_VCL_PNGWRITE_HXX
 
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/dllapi.h>
-#include <vcl/bitmapex.hxx>
 #include <memory>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
+class BitmapEx;
+class SvStream;
+
 namespace vcl
 {
     class PNGWriterImpl;
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index ce578c1733c3..7ea91547232c 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -28,14 +28,11 @@
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 
-#include <com/sun/star/lang/Locale.hpp>
-
 #define PRINTER_PPDDIR "driver"
 
 namespace psp {
 
 class PPDCache;
-class PPDParser;
 class PPDTranslator;
 
 enum PPDValueType { eInvocation, eQuoted, eSymbol, eString, eNo };
@@ -114,9 +111,6 @@ struct PPDKeyhash
  * PPDParser - parses a PPD file and contains all available keys from it
  */
 
-class PPDContext;
-class CUPSManager;
-
 class VCL_DLLPUBLIC PPDParser
 {
     friend class PPDContext;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index a8069d2fec8c..2d1c17e9e486 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -21,24 +21,22 @@
 #define INCLUDED_VCL_PRINT_HXX
 
 #include <rtl/ustring.hxx>
+#include <i18nutil/paper.hxx>
 
 #include <vcl/errcode.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/outdev.hxx>
 #include <vcl/prntypes.hxx>
 #include <vcl/jobset.hxx>
-#include <vcl/gdimtf.hxx>
-#include <tools/multisel.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/view/PrintableState.hpp>
 
 #include <memory>
-#include <set>
 #include <unordered_map>
 
+class GDIMetaFile;
 class SalInfoPrinter;
 struct SalPrinterQueueInfo;
 class SalPrinter;
@@ -47,7 +45,6 @@ enum class SalPrinterError;
 
 namespace vcl {
     class PrinterController;
-    class PrintDialog;
     class Window;
 }
 
diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx
index dc7bd64f449b..de85acaa6ea1 100644
--- a/include/vcl/prntypes.hxx
+++ b/include/vcl/prntypes.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_PRNTYPES_HXX
 
 #include <tools/solar.h>
-#include <i18nutil/paper.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index ba6715475115..80feefcec5b5 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -25,7 +25,6 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <memory>
 
-class ImplRegionBand;
 class RegionBand;
 
 namespace tools {
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 583c89c32823..e3a88e6decf8 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <sot/storage.hxx>
+#include <vcl/gdimtf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 717ea0815d81..7f4772425528 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -38,6 +38,7 @@
 #include <SlideSorterViewShell.hxx>
 #include <DrawDocShell.hxx>
 
+#include <tools/multisel.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 0c8f6d21513c..f9b3dad2732e 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -22,6 +22,7 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/gdimtf.hxx>
 #include <svtools/svmedit.hxx>
 #include <svl/itemset.hxx>
 #include <svl/eitem.hxx>
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index d163a5dcbf42..aaf494b639d9 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -49,6 +49,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/oldprintadaptor.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/gdimtf.hxx>
 
 #include <sfx2/app.hxx>
 #include <sfx2/dinfdlg.hxx>
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 72a4b7b00aed..254177efadf0 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -76,6 +76,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/errcode.hxx>
 #include <vcl/salctype.hxx>
+#include <vcl/gdimtf.hxx>
 #include <comphelper/classids.hxx>
 #include <sot/storinfo.hxx>
 #include <comphelper/fileformat.h>
diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx b/svtools/source/filter/DocumentToGraphicRenderer.cxx
index 1c11438473ea..3dbfcdd5889e 100644
--- a/svtools/source/filter/DocumentToGraphicRenderer.cxx
+++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx
@@ -19,6 +19,7 @@
 
 #include <svtools/DocumentToGraphicRenderer.hxx>
 
+#include <vcl/gdimtf.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index af9fec49084f..c404f0c8cec8 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_INC_JOBSET_H
 
 #include <rtl/ustring.hxx>
+#include <i18nutil/paper.hxx>
 #include <vcl/prntypes.hxx>
 #include <unordered_map>
 
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 5fe92285d650..5cf84e0e475b 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -32,6 +32,11 @@
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/gdimtf.hxx>
+
+namespace vcl {
+    class PrintDialog;
+}
 
 namespace vcl
 {
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index d9669793655d..f13d81945969 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_VCL_INC_SALPRN_HXX
 #define INCLUDED_VCL_INC_SALPRN_HXX
 
+#include <i18nutil/paper.hxx>
 #include <vcl/prntypes.hxx>
 #include <vcl/dllapi.h>
 
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 08f696345aa2..4f1981b146ec 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -19,6 +19,7 @@
 
 #include <officecfg/Office/Common.hxx>
 
+#include <vcl/gdimtf.hxx>
 #include <vcl/print.hxx>
 #include <sal/macros.h>
 #include <osl/diagnose.h>
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx
index 83ecf677f1ed..aa2cf037dd7c 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -14,6 +14,7 @@
 #include <vector>
 
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/security/XCertificate.hpp>
 
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/string.hxx>
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index e23bfdfb0ef9..5a7bc38b643a 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -41,6 +41,7 @@
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <memory>
+#include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 699ab7a377eb..a6f2f7337a6a 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -35,6 +35,7 @@
 #include <tools/gen.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/gradient.hxx>
+#include <vcl/graphictools.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/pdfwriter.hxx>
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 82f99a33cd00..d7b7cf29ba80 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/beans/XMaterialHolder.hpp>
 
 #include <cppuhelper/implbase.hxx>
 
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index 7189791ae315..4122c5f0d82e 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -18,6 +18,9 @@
  */
 
 #include <vcl/pngwrite.hxx>
+#include <vcl/bitmapex.hxx>
+
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <cmath>
 #include <limits>
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 69080676102f..6b7f089f3ffd 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -38,6 +38,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
+#include <vcl/gdimtf.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/print.hxx>
 #include <vcl/pdfwriter.hxx>