From 19f9a7e298ed32e653cc3062b7a332e56ecee24d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 23 Nov 2017 23:03:52 +0100
Subject: Remove unused #include <vcl/metaact.hxx> from vcl/outdev.hxx

...and fix the fallout

Change-Id: Ie514bd95d5a9f990a887566619031e9844c40b92
Reviewed-on: https://gerrit.libreoffice.org/45195
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 chart2/source/tools/CharacterProperties.cxx        |  2 +-
 cppcanvas/source/inc/implrenderer.hxx              |  6 ++-
 cui/source/dialogs/screenshotannotationdlg.cxx     |  1 +
 .../source/ext/macromigration/progresscapture.cxx  |  1 +
 desktop/source/app/cmdlineargs.cxx                 |  1 +
 drawinglayer/qa/unit/border.cxx                    |  1 +
 drawinglayer/source/tools/wmfemfhelper.cxx         |  1 +
 editeng/source/items/itemtype.cxx                  |  3 ++
 editeng/source/items/paraitem.cxx                  |  1 +
 emfio/source/emfuno/xemfparser.cxx                 |  1 +
 emfio/source/reader/mtftools.cxx                   |  1 +
 emfio/source/reader/wmfreader.cxx                  |  2 +
 extensions/source/scanner/sane.hxx                 |  1 +
 filter/source/svg/svgexport.cxx                    | 56 +++++++++++-----------
 filter/source/svg/svgfilter.hxx                    | 31 ++++++------
 filter/source/svg/svgwriter.cxx                    |  4 +-
 filter/source/svg/svgwriter.hxx                    |  5 +-
 forms/source/component/clickableimage.cxx          |  1 +
 forms/source/richtext/rtattributehandler.cxx       |  1 +
 framework/source/dispatch/interceptionhelper.cxx   |  2 +-
 .../source/uiconfiguration/imagemanagerimpl.cxx    |  2 +-
 include/sfx2/fcontnr.hxx                           |  1 +
 include/sfx2/sfxbasemodel.hxx                      |  1 +
 include/svx/charmap.hxx                            |  3 ++
 include/vcl/outdev.hxx                             |  4 +-
 include/vcl/print.hxx                              |  1 +
 include/vcl/textview.hxx                           |  1 +
 include/vcl/vclmedit.hxx                           |  1 +
 oox/source/helper/graphichelper.cxx                |  1 +
 sc/source/core/data/dptabsrc.cxx                   |  1 +
 sc/source/filter/excel/fontbuff.cxx                |  1 +
 sc/source/filter/oox/externallinkfragment.cxx      |  1 +
 sc/source/filter/oox/richstring.cxx                |  1 +
 sc/source/filter/oox/worksheetfragment.cxx         |  1 +
 sc/source/ui/unoobj/fmtuno.cxx                     |  3 ++
 sc/source/ui/view/gridmerg.cxx                     |  3 ++
 sc/source/ui/view/prevloc.cxx                      |  1 +
 sd/source/core/CustomAnimationPreset.cxx           |  1 +
 sd/source/ui/presenter/PresenterPreviewCache.cxx   |  1 +
 sfx2/source/doc/Metadatable.cxx                    |  2 +
 sfx2/source/doc/sfxbasemodel.cxx                   |  1 +
 starmath/source/parse.cxx                          |  1 +
 svtools/source/uno/unoimap.cxx                     |  1 +
 svx/source/form/ParseContext.cxx                   |  1 +
 sw/source/core/text/noteurl.cxx                    |  1 +
 sw/source/filter/html/parcss1.cxx                  |  1 +
 sw/source/filter/ww8/ww8scan.hxx                   |  1 +
 toolkit/source/awt/vclxmenu.cxx                    |  2 +-
 toolkit/source/awt/vclxwindows.cxx                 |  1 +
 vcl/backendtest/VisualBackendTest.cxx              |  1 +
 vcl/backendtest/outputdevice/bitmap.cxx            |  2 +-
 vcl/backendtest/outputdevice/gradient.cxx          |  1 +
 vcl/inc/svdata.hxx                                 |  1 +
 vcl/opengl/texture.cxx                             |  1 +
 vcl/source/app/IconThemeScanner.cxx                |  4 ++
 vcl/source/edit/vclmedit.cxx                       |  2 +-
 vcl/source/helper/commandinfoprovider.cxx          |  1 +
 vcl/source/image/ImplImageTree.cxx                 |  2 +
 vcl/source/outdev/bitmap.cxx                       |  2 +
 vcl/source/outdev/clipping.cxx                     |  3 ++
 vcl/source/outdev/curvedshapes.cxx                 |  2 +
 vcl/source/outdev/gradient.cxx                     |  3 +-
 vcl/source/outdev/hatch.cxx                        |  1 +
 vcl/source/outdev/line.cxx                         |  3 ++
 vcl/source/outdev/map.cxx                          |  4 +-
 vcl/source/outdev/mask.cxx                         |  2 +
 vcl/source/outdev/outdev.cxx                       |  4 ++
 vcl/source/outdev/outdevstate.cxx                  |  4 ++
 vcl/source/outdev/pixel.cxx                        |  2 +
 vcl/source/outdev/polygon.cxx                      |  2 +
 vcl/source/outdev/polyline.cxx                     |  3 +-
 vcl/source/outdev/rect.cxx                         |  2 +-
 vcl/source/outdev/text.cxx                         |  2 +
 vcl/source/outdev/textline.cxx                     |  3 +-
 vcl/source/outdev/transparent.cxx                  |  2 +
 vcl/source/outdev/wallpaper.cxx                    |  2 +
 vcl/source/window/paint.cxx                        |  2 +-
 vcl/unx/gtk/gtksalmenu.cxx                         |  1 +
 vcl/workben/vcldemo.cxx                            |  1 +
 writerfilter/source/rtftok/rtftokenizer.cxx        |  1 +
 80 files changed, 165 insertions(+), 64 deletions(-)

diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 6472b1ebf3cd..d9894b9825ca 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
-
+#include <osl/diagnose.h>
 #include <unotools/lingucfg.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 295da4ee73d7..05c4c9c2ae2e 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -20,7 +20,11 @@
 #ifndef INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX
 #define INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX
 
+#include <sal/config.h>
+
+#include <basegfx/vector/b2dsize.hxx>
 #include <sal/types.h>
+#include <tools/stream.hxx>
 #include <cppcanvas/renderer.hxx>
 #include <cppcanvas/canvas.hxx>
 
@@ -30,7 +34,7 @@
 
 #include <com/sun/star/rendering/FontRequest.hpp>
 #include <com/sun/star/rendering/StrokeAttributes.hpp>
-
+#include <osl/diagnose.h>
 #include <osl/endian.h>
 
 #include <map>
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 42e22182cd1f..576e2d23aeda 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -31,6 +31,7 @@
 #include <comphelper/random.hxx>
 #include <vcl/pngwrite.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx
index ecd6f7b62b41..903069082e68 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.cxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.cxx
@@ -20,6 +20,7 @@
 #include "progresscapture.hxx"
 #include "migrationprogress.hxx"
 
+#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 
 namespace dbmm
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index f65f2fad9ebb..3317189531b0 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -26,6 +26,7 @@
 #endif
 
 #include "cmdlineargs.hxx"
+#include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>
diff --git a/drawinglayer/qa/unit/border.cxx b/drawinglayer/qa/unit/border.cxx
index e56a40dac379..505e30fc4a49 100644
--- a/drawinglayer/qa/unit/border.cxx
+++ b/drawinglayer/qa/unit/border.cxx
@@ -22,6 +22,7 @@
 #include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
 #include <rtl/ref.hxx>
 #include <test/bootstrapfixture.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
 #include <editeng/borderline.hxx>
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 2b338eab94b3..c3a1b4508abd 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -20,6 +20,7 @@
 #include <wmfemfhelper.hxx>
 #include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
 #include <vcl/lineinfo.hxx>
+#include <vcl/metaact.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index 39126f065f1d..6019ddc220c8 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <osl/diagnose.h>
 #include <vcl/outdev.hxx>
 #include <editeng/editrids.hrc>
 #include <unotools/intlwrapper.hxx>
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index b9a314be946a..e6689d434b57 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/extract.hxx>
+#include <osl/diagnose.h>
 #include <unotools/syslocale.hxx>
 #include <comphelper/types.hxx>
 #include <tools/mapunit.hxx>
diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index f2415bbf5a54..63b88811e28f 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -32,6 +32,7 @@
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 
 #include <vcl/svapp.hxx>
+#include <vcl/wmfexternal.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <drawinglayer/primitive2d/metafileprimitive2d.hxx>
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index fa62c205524e..2b81e5b9bdc5 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -24,6 +24,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <vcl/graphictools.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/fract.hxx>
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 6599e54f8b17..7a925e7acfa5 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -25,8 +25,10 @@
 #include <rtl/crc.h>
 #include <rtl/tencinfo.h>
 #include <osl/endian.h>
+#include <vcl/gdimtf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/dibtools.hxx>
+#include <vcl/wmfexternal.hxx>
 #include <tools/fract.hxx>
 #include <o3tl/make_unique.hxx>
 #include <vcl/bitmapaccess.hxx>
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index c40ff1bb8c1b..ae8b6861eff7 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -21,6 +21,7 @@
 
 #include <osl/thread.h>
 #include <osl/module.h>
+#include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
 #include <sane/sane.h>
 #include "scanner.hxx"
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index ab4cb14f5910..8cf1df70a757 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -105,7 +105,7 @@ public:
     {
         pSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", getClassName() );
     }
-    void insertMasterPage( const Reference< XDrawPage>& xMasterPage )
+    void insertMasterPage( const Reference< css::drawing::XDrawPage>& xMasterPage )
     {
         mMasterPageSet.insert( xMasterPage );
     }
@@ -634,7 +634,7 @@ bool SVGFilter::implLookForFirstVisiblePage()
 
     while( ( nCurPage <= nLastPage ) && ( -1 == mnVisiblePage ) )
     {
-        const Reference< XDrawPage > & xDrawPage = mSelectedPages[nCurPage];
+        const Reference< css::drawing::XDrawPage > & xDrawPage = mSelectedPages[nCurPage];
 
         if( xDrawPage.is() )
         {
@@ -694,7 +694,7 @@ bool SVGFilter::implExportDocument()
         // resolution for which to prepare the geometry.
         if(xPrimitiveFactory.is())
         {
-            Reference< XShape > xShapeCandidate;
+            Reference< css::drawing::XShape > xShapeCandidate;
             const Sequence< PropertyValue > aViewInformation;
             const Sequence< PropertyValue > aParams;
 
@@ -876,7 +876,7 @@ template< typename TextFieldType >
 OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet,
                               const TextFieldType & aField,
                               const OUString & sOOOElemField,
-                              const Reference< XDrawPage >& xMasterPage )
+                              const Reference< css::drawing::XDrawPage >& xMasterPage )
 {
     bool bFound = false;
     sal_Int32 i;
@@ -979,9 +979,9 @@ void SVGFilter::implGenerateMetaData()
 
             for( sal_Int32 i = 0; i < nCount; ++i )
             {
-                const Reference< XDrawPage > &    xDrawPage = mSelectedPages[i];
-                Reference< XMasterPageTarget >    xMasterPageTarget( xDrawPage, UNO_QUERY );
-                Reference< XDrawPage >            xMasterPage( xMasterPageTarget->getMasterPage(), UNO_QUERY );
+                const Reference< css::drawing::XDrawPage > & xDrawPage = mSelectedPages[i];
+                Reference< css::drawing::XMasterPageTarget > xMasterPageTarget( xDrawPage, UNO_QUERY );
+                Reference< css::drawing::XDrawPage > xMasterPage( xMasterPageTarget->getMasterPage(), UNO_QUERY );
                 OUString aSlideId(aId + "_" + OUString::number( i ));
 
                 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", aSlideId );
@@ -1189,7 +1189,7 @@ void SVGFilter::implExportTextShapeIndex()
     sal_Int32 nCount = mSelectedPages.size();
     for( sal_Int32 i = 0; i < nCount; ++i )
     {
-        const Reference< XDrawPage > & xDrawPage = mSelectedPages[i];
+        const Reference< css::drawing::XDrawPage > & xDrawPage = mSelectedPages[i];
         if( mTextShapeIdListMap.find( xDrawPage ) != mTextShapeIdListMap.end() )
         {
             OUString sTextShapeIdList = mTextShapeIdListMap[xDrawPage].trim();
@@ -1353,7 +1353,7 @@ Any SVGFilter::implSafeGetPagePropSet( const OUString & sPropertyName,
 /** We collect info on master page elements visibility, and placeholder text shape content.
     This method is used when exporting a single page as implGenerateMetaData is not invoked.
  */
-void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
+void SVGFilter::implGetPagePropSet( const Reference< css::drawing::XDrawPage > & rxPage )
 {
     mVisiblePagePropSet.bIsBackgroundVisible                = true;
     mVisiblePagePropSet.bAreBackgroundObjectsVisible        = true;
@@ -1399,7 +1399,7 @@ void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
 }
 
 
-bool SVGFilter::implExportMasterPages( const std::vector< Reference< XDrawPage > > & rxPages,
+bool SVGFilter::implExportMasterPages( const std::vector< Reference< css::drawing::XDrawPage > > & rxPages,
                                            sal_Int32 nFirstPage, sal_Int32 nLastPage )
 {
     DBG_ASSERT( nFirstPage <= nLastPage,
@@ -1436,7 +1436,7 @@ bool SVGFilter::implExportMasterPages( const std::vector< Reference< XDrawPage >
     {
         if( rxPages[i].is() )
         {
-            Reference< XShapes > xShapes( rxPages[i], UNO_QUERY );
+            Reference< css::drawing::XShapes > xShapes( rxPages[i], UNO_QUERY );
 
             if( xShapes.is() )
             {
@@ -1452,7 +1452,7 @@ bool SVGFilter::implExportMasterPages( const std::vector< Reference< XDrawPage >
 }
 
 
-void SVGFilter::implExportDrawPages( const std::vector< Reference< XDrawPage > > & rxPages,
+void SVGFilter::implExportDrawPages( const std::vector< Reference< css::drawing::XDrawPage > > & rxPages,
                                            sal_Int32 nFirstPage, sal_Int32 nLastPage )
 {
     DBG_ASSERT( nFirstPage <= nLastPage,
@@ -1486,7 +1486,7 @@ void SVGFilter::implExportDrawPages( const std::vector< Reference< XDrawPage > >
 
     for( sal_Int32 i = nFirstPage; i <= nLastPage; ++i )
     {
-        Reference< XShapes > xShapes;
+        Reference< css::drawing::XShapes > xShapes;
 
         if (mbExportShapeSelection)
         {
@@ -1544,8 +1544,8 @@ void SVGFilter::implExportDrawPages( const std::vector< Reference< XDrawPage > >
 
 
 bool SVGFilter::implExportPage( const OUString & sPageId,
-                                    const Reference< XDrawPage > & rxPage,
-                                    const Reference< XShapes > & xShapes,
+                                    const Reference< css::drawing::XDrawPage > & rxPage,
+                                    const Reference< css::drawing::XShapes > & xShapes,
                                     bool bMaster )
 {
     bool bRet = false;
@@ -1645,9 +1645,9 @@ bool SVGFilter::implExportPage( const OUString & sPageId,
 }
 
 
-bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes, bool bMaster )
+bool SVGFilter::implExportShapes( const Reference< css::drawing::XShapes >& rxShapes, bool bMaster )
 {
-    Reference< XShape > xShape;
+    Reference< css::drawing::XShape > xShape;
     bool bRet = false;
 
     for( sal_Int32 i = 0, nCount = rxShapes->getCount(); i < nCount; ++i )
@@ -1662,7 +1662,7 @@ bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes, bool bMa
 }
 
 
-bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, bool bMaster )
+bool SVGFilter::implExportShape( const Reference< css::drawing::XShape >& rxShape, bool bMaster )
 {
     Reference< XPropertySet > xShapePropSet( rxShape, UNO_QUERY );
     bool bRet = false;
@@ -1688,7 +1688,7 @@ bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, bool bMaste
         {
             if( aShapeType.lastIndexOf( "drawing.GroupShape" ) != -1 )
             {
-                Reference< XShapes > xShapes( rxShape, UNO_QUERY );
+                Reference< css::drawing::XShapes > xShapes( rxShape, UNO_QUERY );
 
                 if( xShapes.is() )
                 {
@@ -1855,7 +1855,7 @@ bool SVGFilter::implCreateObjects()
 
     for( i = 0, nCount = mMasterPageTargets.size(); i < nCount; ++i )
     {
-        const Reference< XDrawPage > & xMasterPage = mMasterPageTargets[i];
+        const Reference< css::drawing::XDrawPage > & xMasterPage = mMasterPageTargets[i];
 
         if( xMasterPage.is() )
         {
@@ -1869,7 +1869,7 @@ bool SVGFilter::implCreateObjects()
 
     for( i = 0, nCount = mSelectedPages.size(); i < nCount; ++i )
     {
-        const Reference< XDrawPage > & xDrawPage = mSelectedPages[i];
+        const Reference< css::drawing::XDrawPage > & xDrawPage = mSelectedPages[i];
 
         if( xDrawPage.is() )
         {
@@ -1904,9 +1904,9 @@ bool SVGFilter::implCreateObjects()
 }
 
 
-bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes )
+bool SVGFilter::implCreateObjectsFromShapes( const Reference< css::drawing::XDrawPage > & rxPage, const Reference< css::drawing::XShapes >& rxShapes )
 {
-    Reference< XShape > xShape;
+    Reference< css::drawing::XShape > xShape;
     bool            bRet = false;
 
     for( sal_Int32 i = 0, nCount = rxShapes->getCount(); i < nCount; ++i )
@@ -1921,12 +1921,12 @@ bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPa
 }
 
 
-bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape )
+bool SVGFilter::implCreateObjectsFromShape( const Reference< css::drawing::XDrawPage > & rxPage, const Reference< css::drawing::XShape >& rxShape )
 {
     bool bRet = false;
     if( rxShape->getShapeType().lastIndexOf( "drawing.GroupShape" ) != -1 )
     {
-        Reference< XShapes > xShapes( rxShape, UNO_QUERY );
+        Reference< css::drawing::XShapes > xShapes( rxShape, UNO_QUERY );
 
         if( xShapes.is() )
             bRet = implCreateObjectsFromShapes( rxPage, xShapes );
@@ -2038,9 +2038,9 @@ bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPag
 }
 
 
-void SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& rxDrawPage )
+void SVGFilter::implCreateObjectsFromBackground( const Reference< css::drawing::XDrawPage >& rxDrawPage )
 {
-    Reference< XGraphicExportFilter >  xExporter = drawing::GraphicExportFilter::create( mxContext );
+    Reference< css::drawing::XGraphicExportFilter >  xExporter = drawing::GraphicExportFilter::create( mxContext );
 
     GDIMetaFile             aMtf;
 
@@ -2063,7 +2063,7 @@ void SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& r
 }
 
 
-OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape )
+OUString SVGFilter::implGetClassFromShape( const Reference< css::drawing::XShape >& rxShape )
 {
     OUString            aRet;
     const OUString      aShapeType( rxShape->getShapeType() );
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index e006e8071684..246edf646b3c 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -56,7 +56,6 @@
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -216,13 +215,13 @@ private:
     ObjectMap*                          mpObjects;
     Reference< XComponent >             mxSrcDoc;
     Reference< XComponent >             mxDstDoc;
-    Reference< XDrawPage >              mxDefaultPage;
+    Reference< css::drawing::XDrawPage > mxDefaultPage;
     Sequence< PropertyValue >           maFilterData;
     // #i124608# explicit ShapeSelection for export when export of the selection is wanted
-    Reference< XShapes >                maShapeSelection;
+    Reference< css::drawing::XShapes >  maShapeSelection;
     bool                                mbExportShapeSelection;
-    std::vector< Reference< XDrawPage > > mSelectedPages;
-    std::vector< Reference< XDrawPage > > mMasterPageTargets;
+    std::vector< Reference< css::drawing::XDrawPage > > mSelectedPages;
+    std::vector< Reference< css::drawing::XDrawPage > > mMasterPageTargets;
 
     Link<EditFieldInfo*,void>           maOldFieldHdl;
     Link<EditFieldInfo*,void>           maNewFieldHdl;
@@ -234,7 +233,7 @@ private:
     bool                            implExport( const Sequence< PropertyValue >& rDescriptor );
     static Reference< XWriter >     implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
 
-    void                            implGetPagePropSet( const Reference< XDrawPage > & rxPage );
+    void                            implGetPagePropSet( const Reference< css::drawing::XDrawPage > & rxPage );
     void                            implGenerateMetaData();
     void                            implExportTextShapeIndex();
     void                            implEmbedBulletGlyphs();
@@ -245,26 +244,26 @@ private:
     bool                            implExportDocument();
     void                            implExportAnimations();
 
-    bool                            implExportMasterPages( const std::vector< Reference< XDrawPage > >& rxPages,
+    bool                            implExportMasterPages( const std::vector< Reference< css::drawing::XDrawPage > >& rxPages,
                                                                sal_Int32 nFirstPage, sal_Int32 nLastPage );
-    void                            implExportDrawPages( const std::vector< Reference< XDrawPage > >& rxPages,
+    void                            implExportDrawPages( const std::vector< Reference< css::drawing::XDrawPage > >& rxPages,
                                                              sal_Int32 nFirstPage, sal_Int32 nLastPage );
     bool                            implExportPage( const OUString & sPageId,
-                                                        const Reference< XDrawPage > & rxPage,
-                                                        const Reference< XShapes > & xShapes,
+                                                        const Reference< css::drawing::XDrawPage > & rxPage,
+                                                        const Reference< css::drawing::XShapes > & xShapes,
                                                         bool bMaster );
 
-    bool                            implExportShapes( const Reference< XShapes >& rxShapes,
+    bool                            implExportShapes( const Reference< css::drawing::XShapes >& rxShapes,
                                                           bool bMaster );
-    bool                            implExportShape( const Reference< XShape >& rxShape,
+    bool                            implExportShape( const Reference< css::drawing::XShape >& rxShape,
                                                          bool bMaster );
 
     bool                            implCreateObjects();
-    bool                            implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes );
-    bool                            implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape );
-    void                            implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage );
+    bool                            implCreateObjectsFromShapes( const Reference< css::drawing::XDrawPage > & rxPage, const Reference< css::drawing::XShapes >& rxShapes );
+    bool                            implCreateObjectsFromShape( const Reference< css::drawing::XDrawPage > & rxPage, const Reference< css::drawing::XShape >& rxShape );
+    void                            implCreateObjectsFromBackground( const Reference< css::drawing::XDrawPage >& rxMasterPage );
 
-    static OUString                 implGetClassFromShape( const Reference< XShape >& rxShape );
+    static OUString                 implGetClassFromShape( const Reference< css::drawing::XShape >& rxShape );
     void                            implRegisterInterface( const Reference< XInterface >& rxIf );
     const OUString &                implGetValidIDFromInterface( const Reference< XInterface >& rxIf );
     static OUString                 implGetInterfaceName( const Reference< XInterface >& rxIf );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index a77c53b231ed..732c650c460a 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2757,7 +2757,7 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
 void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
                                         sal_uInt32 nWriteFlags,
                                         const OUString* pElementId,
-                                        const Reference< XShape >* pxShape,
+                                        const Reference< css::drawing::XShape >* pxShape,
                                         const GDIMetaFile* pTextEmbeddedBitmapMtf )
 {
     // need a counter for the actions written per shape to avoid double ID
@@ -3725,7 +3725,7 @@ void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm,
                                      const GDIMetaFile& rMtf,
                                      sal_uInt32 nWriteFlags,
                                      const OUString* pElementId,
-                                     const Reference< XShape >* pXShape,
+                                     const Reference< css::drawing::XShape >* pXShape,
                                      const GDIMetaFile* pTextEmbeddedBitmapMtf )
 {
     MapMode     aMapMode( rMtf.GetPrefMapMode() );
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index fbfe54bfe475..b54e6fffe6dc 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -66,7 +66,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::style;
 using namespace ::com::sun::star::svg;
 using namespace ::com::sun::star::xml::sax;
@@ -365,7 +364,7 @@ private:
     void                    ImplWriteActions( const GDIMetaFile& rMtf,
                                               sal_uInt32 nWriteFlags,
                                               const OUString* pElementId,
-                                              const Reference< XShape >* pXShape = nullptr,
+                                              const Reference< css::drawing::XShape >* pXShape = nullptr,
                                               const GDIMetaFile* pTextEmbeddedBitmapMtf = nullptr );
 
     vcl::Font               ImplSetCorrectFontHeight() const;
@@ -384,7 +383,7 @@ public:
                                            const GDIMetaFile& rMtf,
                                            sal_uInt32 nWriteFlags,
                                            const OUString* pElementId = nullptr,
-                                           const Reference< XShape >* pXShape = nullptr,
+                                           const Reference< css::drawing::XShape >* pXShape = nullptr,
                                            const GDIMetaFile* pTextEmbeddedBitmapMtf = nullptr );
 };
 
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index fa3e46ae47bf..cb37115a4188 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/util/VetoException.hpp>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index 84d3464e571c..41eb8247e0fa 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -19,6 +19,7 @@
 
 #include "rtattributehandler.hxx"
 
+#include <osl/diagnose.h>
 #include <svx/svxids.hrc>
 #include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 2d80df72f0b0..8e478f2dc101 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -20,7 +20,7 @@
 #include <dispatch/interceptionhelper.hxx>
 
 #include <com/sun/star/frame/XInterceptorInfo.hpp>
-
+#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 
 namespace framework{
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index ded9db11ee2e..763af8aa13e6 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
-
+#include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <o3tl/enumrange.hxx>
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index 6a53a36d06ea..a08f014eea61 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -34,6 +34,7 @@
 #include <memory>
 
 namespace vcl { class Window; }
+class ErrCode;
 class SfxFilter;
 class SfxObjectFactory;
 class SfxMedium;
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 5c88f54d5fb3..e383a3de0dd0 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -87,6 +87,7 @@
 
 #include <memory>
 
+class ErrCode;
 class SfxMedium;
 class   SfxPrinter;
 class   SfxViewShell;
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index bee07bbad2aa..2cb8702ca5ba 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -19,6 +19,9 @@
 #ifndef INCLUDED_SVX_CHARMAP_HXX
 #define INCLUDED_SVX_CHARMAP_HXX
 
+#include <sal/config.h>
+
+#include <deque>
 #include <map>
 #include <memory>
 
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index e5d496a29e97..51d296fa8da0 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -21,11 +21,12 @@
 #define INCLUDED_VCL_OUTDEV_HXX
 
 #include <tools/gen.hxx>
+#include <tools/ref.hxx>
 #include <tools/solar.h>
 #include <tools/color.hxx>
 #include <tools/poly.hxx>
 #include <o3tl/typed_flags_set.hxx>
-
+#include <vcl/bitmap.hxx>
 #include <vcl/cairo.hxx>
 #include <vcl/devicecoordinate.hxx>
 #include <vcl/dllapi.h>
@@ -33,7 +34,6 @@
 #include <vcl/region.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/wall.hxx>
-#include <vcl/metaact.hxx>
 #include <vcl/metaactiontypes.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/outdevstate.hxx>
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index e25eaa5dd044..94e8ea377d27 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -32,6 +32,7 @@
 #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>
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index c0cb1de16b96..ad16d8486913 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -22,6 +22,7 @@
 
 #include <tools/gen.hxx>
 #include <tools/lineend.hxx>
+#include <tools/stream.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/dndhelp.hxx>
 #include <vcl/textdata.hxx>
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index c494cdff3420..03f0b5667968 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -24,6 +24,7 @@
 #include <tools/wintypes.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/dllapi.h>
+#include <vcl/timer.hxx>
 
 class ImpVclMEdit;
 class Timer;
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 4c166dcd5206..01f5b5290f93 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -33,6 +33,7 @@
 #include <osl/diagnose.h>
 #include <comphelper/seqstream.hxx>
 #include <vcl/wmf.hxx>
+#include <vcl/wmfexternal.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/gen.hxx>
 #include <comphelper/propertysequence.hxx>
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 7b00c570b039..4aa53ea31b72 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -25,6 +25,7 @@
 #include <vector>
 
 #include <o3tl/any.hxx>
+#include <osl/diagnose.h>
 #include <rtl/math.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/intitem.hxx>
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index 2639f98dacbc..c7a6a9b5f5d1 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -28,6 +28,7 @@
 #include <editeng/escapementitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/wghtitem.hxx>
+#include <osl/diagnose.h>
 #include <sfx2/printer.hxx>
 
 #include <attrib.hxx>
diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx
index ee3f7dd27de8..65f638e53941 100644
--- a/sc/source/filter/oox/externallinkfragment.cxx
+++ b/sc/source/filter/oox/externallinkfragment.cxx
@@ -23,6 +23,7 @@
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
+#include <osl/diagnose.h>
 #include <defnamesbuffer.hxx>
 #include <sheetdatacontext.hxx>
 #include <unitconverter.hxx>
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index 1a0aa149b396..69a51051c13f 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/text/XText.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <editeng/editobj.hxx>
+#include <osl/diagnose.h>
 #include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/helper/propertyset.hxx>
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index 2d00403872a8..d0a71ef90134 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -19,6 +19,7 @@
 
 #include <worksheetfragment.hxx>
 
+#include <osl/diagnose.h>
 #include <oox/core/filterbase.hxx>
 #include <oox/core/relations.hxx>
 #include <oox/helper/attributelist.hxx>
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 731154e4e13e..9f2116ac4cf7 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx
index 9a05482a063f..5ab7ef8e266d 100644
--- a/sc/source/ui/view/gridmerg.cxx
+++ b/sc/source/ui/view/gridmerg.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <vcl/lineinfo.hxx>
 #include <vcl/outdev.hxx>
 
 #include <gridmerg.hxx>
diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx
index 5bc32e702427..cdcc83fcf6dd 100644
--- a/sc/source/ui/view/prevloc.cxx
+++ b/sc/source/ui/view/prevloc.cxx
@@ -20,6 +20,7 @@
 #include <prevloc.hxx>
 #include <document.hxx>
 
+#include <osl/diagnose.h>
 #include <vcl/outdev.hxx>
 
 #include <o3tl/make_unique.hxx>
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 3754479cb46d..84c6413e17c7 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/presentation/EffectPresetClass.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
+#include <osl/diagnose.h>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/getexpandeduri.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index 6695c87274df..1b6b166038e6 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -22,6 +22,7 @@
 
 #include <cache/SlsCacheContext.hxx>
 #include <tools/IdleDetection.hxx>
+#include <vcl/bitmapex.hxx>
 #include <sdpage.hxx>
 #include <cppcanvas/vclfactory.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index d4db1e0b3be0..11f43e088e83 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
 
+#include <osl/diagnose.h>
 #include <sfx2/Metadatable.hxx>
 #include <sfx2/XmlIdRegistry.hxx>
 
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 56ab68ea97df..49f00f46e4ab 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -71,6 +71,7 @@
 #include <tools/diagnose_ex.h>
 #include <unotools/tempfile.hxx>
 #include <osl/mutex.hxx>
+#include <vcl/errcode.hxx>
 #include <vcl/salctype.hxx>
 #include <comphelper/classids.hxx>
 #include <sot/storinfo.hxx>
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 92dca7b025a1..05412fa8e13a 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <i18nlangtag/lang.h>
+#include <tools/lineend.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/syslocale.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index e7e7398dea72..2cf167626ab5 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -35,6 +35,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <algorithm>
 #include <list>
+#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index ab4cc7fcbcf8..bf74bab912bb 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -26,6 +26,7 @@
 
 #include <unotools/syslocale.hxx>
 #include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <fmstring.hrc>
 
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index 80ca8b10fbd9..982dba18ca96 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -20,6 +20,7 @@
 #include <noteurl.hxx>
 
 #include <swtypes.hxx>
+#include <osl/diagnose.h>
 #include <vcl/outdev.hxx>
 #include <svtools/imaprect.hxx>
 #include <svtools/imap.hxx>
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 167df7045193..13c46fc0b5c1 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -19,6 +19,7 @@
 
 #include <stdlib.h>
 #include <limits.h>
+#include <osl/diagnose.h>
 #include <rtl/character.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 4dbaaebc49e8..696ae22e651e 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -34,6 +34,7 @@
 
 #include <osl/endian.h>
 #include <tools/solar.h>
+#include <tools/stream.hxx>
 #include <rtl/ustring.hxx>
 #include "sortedarray.hxx"
 
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index f916d68ec76a..66510b1feba1 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -29,7 +29,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/uuid.h>
 #include <osl/mutex.hxx>
-
+#include <vcl/graph.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/image.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 389421e36722..b912d29f2e26 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -40,6 +40,7 @@
 #include <comphelper/processfactory.hxx>
 
 #include <vcl/button.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/field.hxx>
diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx
index 6e75ac746a71..02623767cf94 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -19,6 +19,7 @@
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
 
 #include <osl/time.h>
+#include <vcl/gradient.hxx>
 #include <vcl/vclmain.hxx>
 #include <vcl/layout.hxx>
 #include <salhelper/thread.hxx>
diff --git a/vcl/backendtest/outputdevice/bitmap.cxx b/vcl/backendtest/outputdevice/bitmap.cxx
index 70d2d42070cf..d8836330d5be 100644
--- a/vcl/backendtest/outputdevice/bitmap.cxx
+++ b/vcl/backendtest/outputdevice/bitmap.cxx
@@ -9,7 +9,7 @@
  */
 
 #include <test/outputdevice.hxx>
-
+#include <vcl/bitmapex.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
 namespace vcl {
diff --git a/vcl/backendtest/outputdevice/gradient.cxx b/vcl/backendtest/outputdevice/gradient.cxx
index b9ccb6ef762a..58e20e5d6092 100644
--- a/vcl/backendtest/outputdevice/gradient.cxx
+++ b/vcl/backendtest/outputdevice/gradient.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <test/outputdevice.hxx>
+#include <vcl/gradient.hxx>
 
 namespace vcl {
 namespace test {
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index f8bed79fb105..c88f8a4ce356 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -66,6 +66,7 @@ class Image;
 class PopupMenu;
 class Application;
 class OutputDevice;
+class SvFileStream;
 class SystemWindow;
 class WorkWindow;
 class Dialog;
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index 4740f3e0cc04..86315b48a4b6 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <tools/stream.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>
 
diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx
index d8a81218c5ec..228c4e00f6cf 100644
--- a/vcl/source/app/IconThemeScanner.cxx
+++ b/vcl/source/app/IconThemeScanner.cxx
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <sal/config.h>
+
+#include <deque>
+
 #include <vcl/IconThemeScanner.hxx>
 
 #include <config_folders.h>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 759bef4e6a68..de34176ea07e 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -21,7 +21,7 @@
 #include <vcl/builder.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
-
+#include <vcl/timer.hxx>
 #include <vcl/vclmedit.hxx>
 #include <vcl/xtextedt.hxx>
 #include <svl/undo.hxx>
diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx
index 931900ad2abe..4cdca54b65d8 100644
--- a/vcl/source/helper/commandinfoprovider.cxx
+++ b/vcl/source/helper/commandinfoprovider.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/commandinfoprovider.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/mnemonic.hxx>
 #include <comphelper/string.hxx>
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 880e7b5ffbb5..32835f868691 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -21,6 +21,8 @@
 
 #include <sal/config.h>
 
+#include <deque>
+
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 0e6b651f3b10..e33cfa60bd70 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -22,6 +22,8 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/bitmapaccess.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <config_features.h>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLHelper.hxx>
diff --git a/vcl/source/outdev/clipping.cxx b/vcl/source/outdev/clipping.cxx
index 5b6d71d4a3f1..e852d6ebd873 100644
--- a/vcl/source/outdev/clipping.cxx
+++ b/vcl/source/outdev/clipping.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/vcl/source/outdev/curvedshapes.cxx b/vcl/source/outdev/curvedshapes.cxx
index a2d93c922cfa..88dde9d5adb2 100644
--- a/vcl/source/outdev/curvedshapes.cxx
+++ b/vcl/source/outdev/curvedshapes.cxx
@@ -19,6 +19,8 @@
 
 #include <cassert>
 
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 68d3f6359694..c3fbd24664db 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -21,8 +21,9 @@
 #include <cassert>
 
 #include <tools/poly.hxx>
-
+#include <vcl/gdimtf.hxx>
 #include <vcl/gradient.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index f0712911f637..e84ec3a2874b 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -22,6 +22,7 @@
 #include <tools/line.hxx>
 
 #include <vcl/hatch.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/salbtype.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/outdev.hxx>
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx
index aef23b5c2f25..eb126cc330da 100644
--- a/vcl/source/outdev/line.cxx
+++ b/vcl/source/outdev/line.cxx
@@ -20,6 +20,9 @@
 #include <cassert>
 #include <numeric>
 
+#include <vcl/gdimtf.hxx>
+#include <vcl/lineinfo.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 1b1be1fe44f3..b3fffe55a077 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -18,7 +18,9 @@
  */
 
 #include <tools/bigint.hxx>
-
+#include <vcl/gdimtf.hxx>
+#include <vcl/lineinfo.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/wrkwin.hxx>
 
diff --git a/vcl/source/outdev/mask.cxx b/vcl/source/outdev/mask.cxx
index 17cd06e4ba68..6c52a544d394 100644
--- a/vcl/source/outdev/mask.cxx
+++ b/vcl/source/outdev/mask.cxx
@@ -19,6 +19,8 @@
 
 #include <cassert>
 
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index e2218fb2c68e..84408cd9eefe 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/unowrap.hxx>
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 4bf6820d3b78..a7f626a4b114 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/outdevstate.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/outdev/pixel.cxx b/vcl/source/outdev/pixel.cxx
index 1c0279596867..afa4673cce33 100644
--- a/vcl/source/outdev/pixel.cxx
+++ b/vcl/source/outdev/pixel.cxx
@@ -22,6 +22,8 @@
 #include <sal/types.h>
 
 #include <memory>
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index ff911a6e31e2..d12fd102364f 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -26,6 +26,8 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <memory>
 #include <tools/poly.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index d29f4a47f9ee..d13014426b68 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -24,7 +24,8 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dlinegeometry.hxx>
-
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index 9adc792ee9b3..ace13e036c86 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -23,7 +23,7 @@
 
 #include <tools/poly.hxx>
 #include <tools/helpers.hxx>
-
+#include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 25c6c5201902..aa2d59cca441 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -26,6 +26,8 @@
 
 #include <comphelper/processfactory.hxx>
 #include <osl/file.h>
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/textrectinfo.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 7d1d44075823..e781a8a9a76e 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -20,7 +20,8 @@
 #include <cassert>
 
 #include <sal/types.h>
-
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 9f9e1431548f..31d4c946bb36 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -25,6 +25,8 @@
 #include <memory>
 
 #include <vcl/bitmapaccess.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/outdev/wallpaper.cxx b/vcl/source/outdev/wallpaper.cxx
index e6aaf70e23cd..a5351e33811a 100644
--- a/vcl/source/outdev/wallpaper.cxx
+++ b/vcl/source/outdev/wallpaper.cxx
@@ -19,6 +19,8 @@
 
 #include <cassert>
 
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 3aa954b90536..3440470b35e6 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <config_features.h>
-
+#include <vcl/gdimtf.hxx>
 #include <vcl/window.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 6f16984ba6d0..4aaaacf14ec5 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -22,6 +22,7 @@
 #include <unx/gtk/gtkinst.hxx>
 
 #include <sal/log.hxx>
+#include <tools/stream.hxx>
 #include <window.h>
 #include <strings.hrc>
 
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index d1ad29c47c34..623a77f695aa 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 
 #include <osl/time.h>
+#include <vcl/gradient.hxx>
 #include <vcl/vclmain.hxx>
 #include <vcl/layout.hxx>
 #include <salhelper/thread.hxx>
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 8a2f53ae1eda..2299c8d05c57 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -8,6 +8,7 @@
  */
 
 #include "rtftokenizer.hxx"
+#include <tools/stream.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-- 
cgit