tdf#42949 Fix IWYU warnings in include/vcl/[i-m]*

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

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

145 files changed, 159 insertions, 58 deletions

diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index c7ca6380f30a..b097e1217760 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -32,6 +32,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
 
+#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <o3tl/make_unique.hxx>
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 46493dc61bdd..006ffbe97888 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -34,6 +34,7 @@
 #include <helpids.h>
 
 #include <vcl/fixed.hxx>
+#include <vcl/dialog.hxx>
 #include <vcl/image.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/weld.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 39c4e8f75be9..df04dbee684a 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -23,6 +23,9 @@
 #include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
+#include <com/sun/star/frame/XModel.hpp>
+
+namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 5fe62b88ea85..7b8dc3936fb8 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -24,6 +24,7 @@
 #include <AxisHelper.hxx>
 #include <LegendHelper.hxx>
 #include <ControllerLockGuard.hxx>
+#include <com/sun/star/frame/XModel.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index 3ad81a5848ca..eac60f235fa9 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/util/XModeChangeListener.hpp>
 #include <com/sun/star/util/XCloseListener.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
+#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XLayoutManagerListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx
index 9d8a2b6d84b0..3787341d70ab 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -27,6 +27,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/ActionDescriptionProvider.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index f80d42378e55..41fc703f9e64 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -44,7 +44,9 @@
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/awt/Key.hpp>
+#include <com/sun/star/awt/KeyEvent.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index 2b651d8d95f6..1fc63544d27c 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -16,6 +16,7 @@
 #include <sfx2/sidebar/SidebarModelUpdate.hxx>
 #include <svx/sidebar/PanelLayout.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/edit.hxx>
 
 #include "ChartSidebarModifyListener.hxx"
 #include "ChartSidebarSelectionListener.hxx"
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index a9d884cdb411..f91faa83b25d 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -13,6 +13,7 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistentry.hxx>
+#include <vcl/fixed.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 4e199a4d1bbd..546560f29c50 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -22,6 +22,7 @@
 #include <memory>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/field.hxx>
+#include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/svtabbx.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 22968fcada98..781ebfba3c0a 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -23,6 +23,7 @@
 #include <svl/aeitem.hxx>
 #include <vcl/svtabbx.hxx>
 #include <vcl/treelistentry.hxx>
+#include <vcl/fixed.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/defaultoptions.hxx>
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index f439986c6159..d0850c3343f3 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -11,6 +11,7 @@
 #include <svx/svxdlg.hxx>
 #include <comphelper/sequence.hxx>
 #include <sal/log.hxx>
+#include <vcl/fixed.hxx>
 
 #include "tsaurls.hxx"
 
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 9f606ab1f6c9..4d204e34708a 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -23,6 +23,7 @@
 #include <osl/diagnose.h>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/XResultSetAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
 #include <TokenWriter.hxx>
 #include <stringconstants.hxx>
 #include <svx/dataaccessdescriptor.hxx>
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 1cf967ed9aad..8153a2faab18 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/frame/XController.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index c1356a9a4beb..347c6e6445fa 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -94,6 +94,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/vclmedit.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 3a45f302cc6b..9637b1a583fd 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -49,6 +49,7 @@
 #include <tools/stream.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/hatch.hxx>
+#include <vcl/outdev.hxx>
 #include <emfplushelper.hxx>
 #include <numeric>
 
diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index 86edeb0aa944..d212fc58b79f 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -31,6 +31,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 
+#include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wmfexternal.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 38eb685216be..30b35ec82420 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -29,6 +29,7 @@
 #include <vcl/canvastools.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 875f29a77641..56169f051fed 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -29,6 +29,7 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/dibtools.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/wmfexternal.hxx>
 #include <tools/fract.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index b5288387b737..de447c4a59f0 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -29,6 +29,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/fixed.hxx>
 #include "general.hxx"
 #include "bibresid.hxx"
 #include "datman.hxx"
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 45366f52a7fd..004071496b1f 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -20,6 +20,7 @@
 
 #include <tools/stream.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <svl/solar.hrc>
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index ee50754e30ae..00d641aebb9b 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -22,6 +22,7 @@
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <tools/stream.hxx>
 
 //============================ PBMReader ==================================
 
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index d0af67317cf4..f76ba225def7 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -25,6 +25,7 @@
 #include <vcl/fltcall.hxx>
 #include <svl/solar.hrc>
 #include <vcl/FilterConfigItem.hxx>
+#include <tools/stream.hxx>
 
 //============================ PCDReader ==================================
 
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index f18f1747be9f..93cebc1e6dce 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -21,6 +21,7 @@
 #include <memory>
 #include <vcl/graph.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <tools/stream.hxx>
 
 class FilterConfigItem;
 
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 14a7b4bf58e2..4b6e459dad14 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -25,6 +25,7 @@
 #include <vcl/gdimtf.hxx>
 #include <tools/poly.hxx>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include <vcl/virdev.hxx>
 #include <math.h>
 
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 7ffe0e4a765a..6decd58d4cb4 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -23,6 +23,7 @@
 #include <vcl/outdev.hxx>
 #include <sal/log.hxx>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include <memory>
 
 class FilterConfigItem;
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 54401c8c05b2..f2fca2cdf960 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -21,6 +21,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <sal/log.hxx>
+#include <tools/stream.hxx>
 
 class FilterConfigItem;
 
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index a1e46681c7a3..1408bf5ff4cc 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -20,6 +20,7 @@
 
 #include <vcl/graph.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <tools/stream.hxx>
 #include <memory>
 
 class FilterConfigItem;
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index d2bb00e3720f..ec55044fd32c 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -26,6 +26,7 @@
 #include <vcl/BitmapTools.hxx>
 #include <vcl/animate.hxx>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include "lzwdecom.hxx"
 #include "ccidecom.hxx"
 
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index c270134d2d49..34fe024ee07a 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -20,6 +20,7 @@
 
 #include "commonpicker.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index 99370698fc38..139c40efc818 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -24,6 +24,7 @@
 
 #include <rtl/ustring.hxx>
 #include <vcl/menu.hxx>
+#include <vector>
 
 namespace framework
 {
diff --git a/framework/source/uiconfiguration/ImageList.hxx b/framework/source/uiconfiguration/ImageList.hxx
index 85c9459a7b5d..a4b46f5160d9 100644
--- a/framework/source/uiconfiguration/ImageList.hxx
+++ b/framework/source/uiconfiguration/ImageList.hxx
@@ -20,6 +20,8 @@
 #ifndef FRAMEWORK_SOURCE_UICONFIGURATION_IMAGELIST_HXX
 #define FRAMEWORK_SOURCE_UICONFIGURATION_IMAGELIST_HXX
 
+struct ImplImageList;
+
 class ImageList
 {
 public:
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 17d57b5172ce..3d6389e633f3 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -319,3 +319,11 @@ blacklist:
     include/vcl/help.hxx:
     # Needed for template
     - o3tl/typed_flags_set.hxx
+    include/vcl/imap.hxx:
+    # Needed for implicit dtor
+    - vcl/imapobj.hxx
+    include/vcl/keycodes.hxx:
+    # Needed for macros
+    - com/sun/star/awt/Key.hpp
+    - com/sun/star/awt/KeyGroup.hpp
+
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index 6d9a1e4f764b..d462088fc2d4 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -24,6 +24,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <vcl/metric.hxx>
+#include <vcl/vclptr.hxx>
 #include <tools/solar.h>
 
 #include <vector>
diff --git a/include/vcl/IDialogRenderable.hxx b/include/vcl/IDialogRenderable.hxx
index a2c9b8416ccd..e5596c5fe88f 100644
--- a/include/vcl/IDialogRenderable.hxx
+++ b/include/vcl/IDialogRenderable.hxx
@@ -13,7 +13,6 @@
 
 #include <vcl/dllapi.h>
 
-#include <tools/gen.hxx>
 #include <rtl/ustring.hxx>
 
 #include <vector>
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index d50f1ff192d4..2064b934b5c2 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -11,16 +11,13 @@
 #ifndef INCLUDED_VCL_ITILEDRENDERABLE_HXX
 #define INCLUDED_VCL_ITILEDRENDERABLE_HXX
 
-#include <LibreOfficeKit/LibreOfficeKitTypes.h>
 #include <tools/gen.hxx>
-#include <svx/ruler.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/pointr.hxx>
 #include <vcl/ptrstyle.hxx>
-#include <vcl/virdev.hxx>
-#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
+#include <map>
 
 namespace vcl
 {
diff --git a/include/vcl/IconThemeScanner.hxx b/include/vcl/IconThemeScanner.hxx
index 03f472bd5928..3cbca74a4683 100644
--- a/include/vcl/IconThemeScanner.hxx
+++ b/include/vcl/IconThemeScanner.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_VCL_ICONTHEMESCANNER_HXX
 
 #include <vcl/dllapi.h>
-#include <tools/solar.h>
 
 #include <rtl/ustring.hxx>
 #include <vcl/IconThemeInfo.hxx>
@@ -22,11 +21,6 @@
 // forward declaration of unit test class. Required for friend relationship.
 class IconThemeScannerTest;
 
-namespace osl {
-class Directory;
-class DirectoryItem;
-}
-
 namespace vcl {
 
 /** This class scans a folder for icon themes and provides the results.
diff --git a/include/vcl/ImageTree.hxx b/include/vcl/ImageTree.hxx
index 4b49a31f30b9..1834bad71646 100644
--- a/include/vcl/ImageTree.hxx
+++ b/include/vcl/ImageTree.hxx
@@ -22,9 +22,11 @@
 
 #include <memory>
 #include <sal/config.h>
-#include <tools/stream.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/bitmapex.hxx>
+#include <rtl/ustring.hxx>
+#include <o3tl/typed_flags_set.hxx>
+
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
 
 enum class ImageLoadFlags : sal_uInt16
 {
@@ -42,6 +44,8 @@ namespace com { namespace sun { namespace star { namespace container {
 }}}}
 
 class ImplImageTree;
+class BitmapEx;
+class SvMemoryStream;
 
 class ImageTree
 {
diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx
index 8742093ebe36..b3657afe7da6 100644
--- a/include/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
@@ -41,8 +41,6 @@ namespace utl {
 
 class LocaleDataWrapper;
 
-class Date;
-
 namespace vcl
 {
 
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 526243bcf382..17bfce780461 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -22,18 +22,14 @@
 
 #include <vcl/dllapi.h>
 #include <tools/gen.hxx>
-#include <tools/solar.h>
 #include <vcl/bitmapex.hxx>
 #include <vcl/outdev.hxx>
 
-#include <com/sun/star/uno/Reference.hxx>
-
 #include <memory>
-#include <vector>
 
 struct ImplImage;
-struct ImplImageList;
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphic;} } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
 
 namespace vcl
 {
diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx
index e143e7b811c8..e2217b87b6e8 100644
--- a/include/vcl/imap.hxx
+++ b/include/vcl/imap.hxx
@@ -28,7 +28,6 @@
 #include <vector>
 
 class Point;
-namespace tools { class Rectangle; }
 class Size;
 class Fraction;
 class IMapObject;
diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx
index 1e5ab2e5c18c..b5fedbd3cfb2 100644
--- a/include/vcl/imapobj.hxx
+++ b/include/vcl/imapobj.hxx
@@ -25,7 +25,6 @@
 #include <rtl/strbuf.hxx>
 
 class Point;
-namespace tools { class Rectangle; }
 class SvStream;
 
 #define IMAP_OBJ_RECTANGLE  (sal_uInt16(0x0001))
diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx
index 528f2046fd52..a38829776236 100644
--- a/include/vcl/imgctrl.hxx
+++ b/include/vcl/imgctrl.hxx
@@ -23,7 +23,6 @@
 #include <vcl/dllapi.h>
 
 #include <vcl/fixed.hxx>
-#include <vcl/bitmapex.hxx>
 
 
 class VCL_DLLPUBLIC ImageControl : public FixedImage
diff --git a/include/vcl/inetimg.hxx b/include/vcl/inetimg.hxx
index 374a2122dfc6..64d64c122553 100644
--- a/include/vcl/inetimg.hxx
+++ b/include/vcl/inetimg.hxx
@@ -19,12 +19,10 @@
 #ifndef INCLUDED_VCL_INETIMG_HXX
 #define INCLUDED_VCL_INETIMG_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #include <sot/formats.hxx>
 
-class SvData;
-class SotDataObject;
-
 
 class INetImage
 {
diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx
index 95c860e1a902..25d057b91b99 100644
--- a/include/vcl/inputctx.hxx
+++ b/include/vcl/inputctx.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INPUTCTX_HXX
 #define INCLUDED_VCL_INPUTCTX_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
 #include <o3tl/typed_flags_set.hxx>
diff --git a/include/vcl/introwin.hxx b/include/vcl/introwin.hxx
index 502a84fd90d5..af5eb1ad57d7 100644
--- a/include/vcl/introwin.hxx
+++ b/include/vcl/introwin.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INTROWIN_HXX
 #define INCLUDED_VCL_INTROWIN_HXX
 
-#include <vcl/bitmapex.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/wrkwin.hxx>
 
diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx
index a641ea018797..ff7b5dfb65a6 100644
--- a/include/vcl/jobset.hxx
+++ b/include/vcl/jobset.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_VCL_JOBSET_HXX
 #define INCLUDED_VCL_JOBSET_HXX
 
+#include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/prntypes.hxx>
 #include <o3tl/cow_wrapper.hxx>
 
 class SvStream;
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 0c4cb53bc523..86a967c66415 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -12,13 +12,10 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/help.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/vclmedit.hxx>
 #include <vcl/window.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/IContext.hxx>
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index f7d74573de66..013205b3a64e 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -21,18 +21,11 @@
 #define INCLUDED_VCL_LAZYDELETE_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/vclptr.hxx>
-#include <vcl/window.hxx>
-
-#include <unordered_map>
-#include <vector>
-#include <algorithm>
-#include <sal/log.hxx>
-
-#include <typeinfo>
 
 #include <com/sun/star/lang/XComponent.hpp>
 
+#include <memory>
+
 namespace vcl
 {
     /*
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index f09097c5d2bf..e0be5fa62a41 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -29,7 +29,6 @@
 class Point;
 class Fraction;
 class SvStream;
-class OutputDevice;
 
 
 class VCL_DLLPUBLIC MapMode
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 0141582f1af1..552a596b46a0 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -23,17 +23,15 @@
 #include <memory>
 #include <vcl/vclenum.hxx>
 #include <tools/link.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
-#include <vcl/bitmapex.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/vclreferencebase.hxx>
 #include <vcl/vclevent.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <list>
 
+class OutputDevice;
 struct ImplSVEvent;
 struct MenuItemData;
 class Point;
@@ -41,7 +39,6 @@ class Size;
 namespace tools { class Rectangle; }
 class Menu;
 class MenuItemList;
-class HelpEvent;
 class Image;
 class PopupMenu;
 class KeyEvent;
@@ -56,6 +53,8 @@ namespace com { namespace sun { namespace star { namespace accessibility {
     class XAccessible;
 }}}}
 
+namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+
 namespace vcl
 {
 class Window;
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index a76e3a3aba94..90d42fc607fc 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -24,11 +24,8 @@
 #include <vcl/dllapi.h>
 #include <memory>
 
-class FloatingWindow;
 class Timer;
 class PopupMenu;
-class VclBuilder;
-class VclSimpleEvent;
 
 class VCL_DLLPUBLIC MenuButton : public PushButton
 {
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 526582aea20f..3beec1fbf42e 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -30,8 +30,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/region.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/outdev.hxx>
+#include <vcl/outdevstate.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/lineinfo.hxx>
@@ -39,6 +38,7 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <rtl/ref.hxx>
 
+class OutputDevice;
 class SvStream;
 enum class DrawTextFlags;
 
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 3709364a0b5c..55d26cede8fd 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -22,11 +22,11 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
-#include <vcl/outdev.hxx>
+#include <tools/ref.hxx>
+#include <tools/gen.hxx>
 
 class ImplFontMetric;
-class ImplFontCharMap;
-class CmapResult;
+class FontCharMap;
 
 typedef sal_uInt32 sal_UCS4;
 typedef tools::SvRef<FontCharMap> FontCharMapRef;
diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index f7db3a3095fb..2404d7c97ca5 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -21,10 +21,10 @@
 #define INCLUDED_VCL_MNEMONIC_HXX
 
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
 
+namespace com { namespace sun { namespace star { namespace i18n { class XCharacterClassification; } } } }
 
 // Mnemonic Chars, which we want support
 // Latin 0-9
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index c66142b9035a..3a43ee2c7386 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -40,6 +40,7 @@
 #include <vcl/keycod.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/vclenum.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index bb8d0d9a1929..ee2b44b3b98f 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -36,6 +36,7 @@
 #include <vcl/wmf.hxx>
 #include <vcl/wmfexternal.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/outdev.hxx>
 #include <tools/gen.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 0e68afbd0058..42903a6bbb1f 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -48,6 +48,7 @@
 #include <com/sun/star/sheet/XCellRangesAccess.hpp>
 #include <com/sun/star/sheet/opencl/XOpenCLSelection.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
+#include <com/sun/star/uno/XAggregation.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <svl/itemprop.hxx>
diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx
index 8e9bd2f7f7db..12cb2c1b92c4 100644
--- a/sc/source/core/tool/chartlock.cxx
+++ b/sc/source/core/tool/chartlock.cxx
@@ -27,6 +27,7 @@
 #include <drwlayer.hxx>
 
 #include <com/sun/star/embed/XComponentSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 
 using namespace com::sun::star;
 using ::com::sun::star::uno::Reference;
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 69ffd1638487..e21bf273f7b6 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -45,6 +45,7 @@
 
 #include <com/sun/star/sheet/DataImportMode.hpp>
 #include <com/sun/star/table/TableOrientation.hpp>
+#include <osl/diagnose.h>
 
 #include <memory>
 
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index 3093c33f0a8e..5436f08ea342 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <com/sun/star/table/XColumnRowRange.hpp>
 #include <com/sun/star/sheet/XPrintAreas.hpp>
+#include <osl/diagnose.h>
 
 #define SC_ISFILTERED "IsFiltered"
 
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index d97b5e6dad49..dba9bdfa36db 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <toolkit/helper/convert.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 8dcba0cae6b0..a57fab56773a 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <svx/AccessibleTextHelper.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index e8c2d2818d26..fd04472b9172 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include <vcl/window.hxx>
 #include <svl/hint.hxx>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index ceaee901f68e..608d03395528 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 269379812e6f..45c353495a0d 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <sal/log.hxx>
 #include <tools/gen.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index df1b94034214..43ebbe00c9f8 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -32,6 +32,7 @@
 #include <strings.hrc>
 
 #include <consdlg.hxx>
+#include <vcl/fixed.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index f7362aeabac3..451a3c2f2eca 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -28,6 +28,7 @@
 #include <unotools/useroptions.hxx>
 #include <vcl/weld.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <vcl/vclmedit.hxx>
 
 #include <global.hxx>
 #include <globstr.hrc>
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 169875f51697..c0db5f64ef63 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -28,6 +28,8 @@
 #include <osl/thread.h>
 #include <rtl/tencinfo.h>
 #include <imoptdlg.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/dialog.hxx>
 
 // ScDelimiterTable
 
diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx
index e294c3d8a1d0..48c5ac74f38b 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -11,6 +11,7 @@
 
 #include <svtools/simptabl.hxx>
 #include <vcl/treelistentry.hxx>
+#include <vcl/fixed.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <dociter.hxx>
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 0f226c199df3..c9879e60b515 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <formula/funcvarargs.h>
+#include <vcl/fixed.hxx>
 
 #include <sc.hrc>
 #include <global.hxx>
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx
index 551b3aee9fbb..d97524a6dec6 100644
--- a/sc/source/ui/inc/scuiimoptdlg.hxx
+++ b/sc/source/ui/inc/scuiimoptdlg.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_SCUIIMOPTDLG_HXX
 
 #include <vcl/layout.hxx>
+#include <vcl/dialog.hxx>
 #include <svx/txencbox.hxx>
 
 class ScDelimiterTable;
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 0e1a275af067..8a2d3cf4f65f 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_VIEWDATA_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_VIEWDATA_HXX
 
+#include <tools/fract.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <rangelst.hxx>
 #include <scdllapi.h>
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 9c79f6860207..12a02e4ecf8f 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -24,6 +24,7 @@
 #include <docsh.hxx>
 #include <crnrdlg.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/fixed.hxx>
 #include <memory>
 
 namespace
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index cb58ad0c42ff..b8bff7916874 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -22,6 +22,7 @@
 
 #include <utility>
 #include <vcl/lstbox.hxx>
+#include <vcl/fixed.hxx>
 
 constexpr int MENU_START = 0;
 constexpr int MENU_COLUMN = 1;
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index 7a3c9c51cda0..28712c3b16c3 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -19,6 +19,7 @@
 
 #include <protectiondlg.hxx>
 #include <tabprotection.hxx>
+#include <vcl/fixed.hxx>
 
 #include <sal/macros.h>
 #include <vector>
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 36cbaf11f1b5..ca903eace0c0 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -31,6 +31,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/lstbox.hxx>
+#include <vcl/fixed.hxx>
 #include <sal/log.hxx>
 
 #include <unotools/useroptions.hxx>
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index f10fd52d4086..f68edf8cf196 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -22,6 +22,7 @@
 #include <svl/itemprop.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
 
 #include <scitems.hxx>
 #include <funcuno.hxx>
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 204af6d01f8f..0ef831bfdb9b 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -42,6 +42,7 @@
 #include <svl/itemset.hxx>
 #include <svl/intitem.hxx>
 #include <svl/zformat.hxx>
+#include <tools/fract.hxx>
 
 #include <com/sun/star/table/BorderLine.hpp>
 #include <com/sun/star/table/CellVertJustify2.hpp>
diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx
index 80f9d3249e57..28d55a14c4e5 100644
--- a/sc/source/ui/vba/vbasheetobject.cxx
+++ b/sc/source/ui/vba/vbasheetobject.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/awt/TextAlign.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index ef58c74cca98..1d53dbdacc7e 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -33,6 +33,7 @@
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <tools/lineend.hxx>
 #include <svtools/colorcfg.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 14b4e6673ca3..18cfba805837 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -24,6 +24,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/fixed.hxx>
 
 #include <unotools/dynamicmenuoptions.hxx>
 #include <unotools/historyoptions.hxx>
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 0aecb7d14949..368e75f81cda 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -29,6 +29,7 @@
 
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/wrkwin.hxx>
 
 #include <basegfx/numeric/ftools.hxx>
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 01085eef1f67..e1223a036f31 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -72,6 +72,7 @@
 #include <salhelper/timer.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/dialog.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <unotools/intlwrapper.hxx>
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 4efde710a714..47b19ff3704d 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -30,6 +30,7 @@
 #include "exportdialog.hxx"
 #include <uno/mapping.hxx>
 #include <tools/fldunit.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 5ccbfb308df5..6746592d9d18 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -20,6 +20,7 @@
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
 #include <svx/DescriptionGenerator.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 16aacb3e580a..6a77f75efdba 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -19,6 +19,7 @@
 
 #include <o3tl/make_unique.hxx>
 #include <vcl/field.hxx>
+#include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index 538f711dc286..a1bd154249dc 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -26,6 +26,8 @@
 #include <sal/types.h>
 // classes <Point>, <Size> and <Rectangle>
 #include <tools/gen.hxx>
+// RenderContext type
+#include <vcl/outdev.hxx>
 // datatype <SwTwips>
 #include "swtypes.hxx"
 
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 66ca09b98038..bf33086b75a8 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -55,6 +55,7 @@
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
 #include <com/sun/star/document/XDocumentLanguages.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
+#include <com/sun/star/uno/XAggregation.hpp>
 #include <o3tl/deleter.hxx>
 #include <rtl/ref.hxx>
 #include <svx/fmdmod.hxx>
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 66382ecc216c..c4586edb104c 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -28,6 +28,7 @@
 #include <vcl/mapmod.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/lazydelete.hxx>
+#include <vcl/window.hxx>
 
 namespace com { namespace sun { namespace star { namespace accessibility {
            class XAccessible; } } } }
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index adfe22ab47c6..b8e919bae9f7 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -32,6 +32,7 @@
 #include <toolkit/awt/vclxdevice.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <vcl/outdev.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index d20bac180097..b9f584e5a672 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -20,6 +20,7 @@
 #include <o3tl/make_unique.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <xmloff/nmspmap.hxx>
 #include <format.hxx>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 734f5cb58597..35415c65df6d 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -21,6 +21,7 @@
 #include <mailmergewizard.hxx>
 #include <swtypes.hxx>
 #include "addresslistdialog.hxx"
+#include <vcl/fixed.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/xtextedt.hxx>
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 86f0a1a1dac1..917f70e4ead1 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -27,6 +27,7 @@
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/mail/XSmtpService.hpp>
+#include <vcl/fixed.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 1d91a70a7388..7569bfa57e92 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -22,6 +22,7 @@
 #include <rtl/ustring.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <vcl/treelistentry.hxx>
+#include <tools/lineend.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index 20f7d59ad734..3d03b567aa76 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -27,6 +27,7 @@
 #include <editeng/svxenum.hxx>
 #include <osl/diagnose.h>
 
+#include <tools/mapunit.hxx>
 #include <tools/globname.hxx>
 #include <swtypes.hxx>
 #include <itabenum.hxx>
diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx
index 2a4af0693104..e31f2e2166aa 100644
--- a/sw/source/uibase/inc/ascfldlg.hxx
+++ b/sw/source/uibase/inc/ascfldlg.hxx
@@ -24,6 +24,7 @@
 #include <sfx2/basedlgs.hxx>
 #include <svx/txencbox.hxx>
 #include <svx/langbox.hxx>
+#include <tools/lineend.hxx>
 
 class SwAsciiOptions;
 class SvStream;
diff --git a/test/source/mtfxmldump.cxx b/test/source/mtfxmldump.cxx
index e54c78c5f1d6..c643834c8d03 100644
--- a/test/source/mtfxmldump.cxx
+++ b/test/source/mtfxmldump.cxx
@@ -12,6 +12,7 @@
 #include <tools/XmlWriter.hxx>
 
 #include <vcl/metaact.hxx>
+#include <vcl/outdev.hxx>
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
 
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 8e7e2ab98560..8f45589740b7 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <ooo/vba/office/MsoShapeType.hpp>
 #include <ooo/vba/office/MsoAutoShapeType.hpp>
 #include <ooo/vba/word/WdRelativeHorizontalPosition.hpp>
diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx
index 496cbe73cbc9..130973c3c006 100644
--- a/vcl/inc/PhysicalFontFamily.hxx
+++ b/vcl/inc/PhysicalFontFamily.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX
 
 #include <vcl/dllapi.h>
+#include <vcl/outdev.hxx>
 
 #include <set>
 
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index f24c6fe34255..457a33cfcddb 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_INC_IMPGRAPH_HXX
 
 #include <vcl/GraphicExternalLink.hxx>
+#include <vcl/graph.hxx>
 #include "graphic/Manager.hxx"
 
 struct ImpSwapInfo
diff --git a/vcl/inc/messagedialog.hxx b/vcl/inc/messagedialog.hxx
index 756409ef8a3f..c809b0cfb144 100644
--- a/vcl/inc/messagedialog.hxx
+++ b/vcl/inc/messagedialog.hxx
@@ -12,6 +12,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/fixed.hxx>
 
 class MessageDialog : public Dialog
 {
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index b09f3223cdad..d87a09c070b2 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_INC_SALGDI_HXX
 
 #include <vcl/metric.hxx>
+#include <vcl/outdev.hxx>
 
 #include "impfontmetricdata.hxx"
 #include "salgdiimpl.hxx"
diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx
index 774eec877957..eec85653cf7b 100644
--- a/vcl/inc/unx/freetype_glyphcache.hxx
+++ b/vcl/inc/unx/freetype_glyphcache.hxx
@@ -25,6 +25,8 @@
 #include <fontinstance.hxx>
 #include <vcl/glyphitem.hxx>
 
+class CmapResult;
+
 // FreetypeFontFile has the responsibility that a font file is only mapped once.
 // (#86621#) the old directly ft-managed solution caused it to be mapped
 // in up to nTTC*nSizes*nOrientation*nSynthetic times
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 59811d6a144a..972d43c030e5 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -27,6 +27,7 @@
 
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <tools/gen.hxx>
+#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/metric.hxx>
 
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index ae433e93c0cd..a0c54523fdf6 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <gtk/gtk.h>
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index df0a885a2ea7..d95d3de9f92f 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -52,6 +52,7 @@
 #include <vcl/treelistentry.hxx>
 #include <vcl/toolkit/unowrap.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/vclmedit.hxx>
 #include <bitmaps.hlst>
 
 SalFrame::SalFrame()
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index c5f223bcf45a..317ef0495195 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -35,6 +35,7 @@
 #endif
 #include <tools/diagnose_ex.h>
 #include <tools/fract.hxx>
+#include <tools/stream.hxx>
 #include <bitmapwriteaccess.hxx>
 
 using namespace css;
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 5a108ca26f47..5a5dec974c9f 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -22,6 +22,7 @@
 #include <unotools/configmgr.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/outdev.hxx>
 #include <sal/log.hxx>
 
 #include <fontinstance.hxx>
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 9f56bc102902..9dc0b381f4b6 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -24,6 +24,7 @@
 #include <PhysicalFontCollection.hxx>
 #include <svdata.hxx>
 #include <vcl/ITiledRenderable.hxx>
+#include <vcl/virdev.hxx>
 #include <sal/log.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx
index d2389ccacb21..68d3b45b6451 100644
--- a/vcl/source/graphic/UnoGraphicDescriptor.cxx
+++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/graphic/GraphicType.hpp>
 
+#include <vcl/outdev.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <memory>
diff --git a/vcl/source/graphic/UnoGraphicTransformer.cxx b/vcl/source/graphic/UnoGraphicTransformer.cxx
index 2fba69d01c93..af1ed9a7f6fd 100644
--- a/vcl/source/graphic/UnoGraphicTransformer.cxx
+++ b/vcl/source/graphic/UnoGraphicTransformer.cxx
@@ -20,6 +20,7 @@
 
 #include <graphic/UnoGraphicTransformer.hxx>
 
+#include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/image.hxx>
 #include <vcl/metaact.hxx>
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 22fd194b3a8d..2a42ae235532 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -50,6 +50,7 @@
 #include <vcl/BitmapTools.hxx>
 #include <vcl/IconThemeScanner.hxx>
 #include <vcl/pngwrite.hxx>
+#include <vcl/outdev.hxx>
 
 #include <BitmapLightenFilter.hxx>
 
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index a8b4c1767058..bc54bcfac2bd 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -21,6 +21,7 @@
 #include <sal/log.hxx>
 
 #include <vcl/gdimtf.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/outdev.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index b68fd2dbcba1..6e8acdf41d51 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -21,6 +21,7 @@
 #include <boost/multi_array.hpp>
 #include <officecfg/Office/Common.hxx>
 #include <vcl/abstdlg.hxx>
+#include <vcl/vclmedit.hxx>
 #include <sal/log.hxx>
 
 #include <svdata.hxx>
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index f7797844b29d..316980aa067e 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -18,6 +18,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <editeng/unoprnms.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/outdev.hxx>
 #include <unotools/datetime.hxx>
 #include <comphelper/sequence.hxx>
 
diff --git a/writerperfect/qa/unit/DrawingImportTest.cxx b/writerperfect/qa/unit/DrawingImportTest.cxx
index 4e1300d496c3..a33a3409eeec 100644
--- a/writerperfect/qa/unit/DrawingImportTest.cxx
+++ b/writerperfect/qa/unit/DrawingImportTest.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
diff --git a/writerperfect/qa/unit/PresentationImportTest.cxx b/writerperfect/qa/unit/PresentationImportTest.cxx
index 4b2a65296545..934d7d0013d3 100644
--- a/writerperfect/qa/unit/PresentationImportTest.cxx
+++ b/writerperfect/qa/unit/PresentationImportTest.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
index e5ad7a3fcc1e..4951fb0ad9a7 100644
--- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx
+++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 86d21ec8a6e2..7871604a787d 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -9,6 +9,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
index c251fc1f2b42..43486d3cd2af 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
@@ -10,6 +10,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include <libmwaw/libmwaw.hxx>
 #include <libodfgen/libodfgen.hxx>
diff --git a/writerperfect/source/calc/NumbersImportFilter.cxx b/writerperfect/source/calc/NumbersImportFilter.cxx
index 3841ca35e12b..a24bf7dbc605 100644
--- a/writerperfect/source/calc/NumbersImportFilter.cxx
+++ b/writerperfect/source/calc/NumbersImportFilter.cxx
@@ -12,6 +12,7 @@
 #include <libetonyek/libetonyek.h>
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include "NumbersImportFilter.hxx"
 
diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
index a8505700c2ac..fa9e8565f736 100644
--- a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
+++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include <libstaroffice/libstaroffice.hxx>
 #include <libodfgen/libodfgen.hxx>
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index f9ca74b44349..c9b63a677145 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -12,6 +12,7 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <libcdr/libcdr.h>
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index 84c610c3cf2f..2bc5e7175569 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -12,6 +12,7 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <libcdr/libcdr.h>
diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx
index def81cfa1420..b873232792fb 100644
--- a/writerperfect/source/draw/FreehandImportFilter.cxx
+++ b/writerperfect/source/draw/FreehandImportFilter.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <libfreehand/libfreehand.h>
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 0927777cc6ae..c755dc816da7 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <libmspub/libmspub.h>
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
index 2816d6a37518..6d38af9e17d0 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
@@ -10,6 +10,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include <libmwaw/libmwaw.hxx>
 #include <libodfgen/libodfgen.hxx>
diff --git a/writerperfect/source/draw/PageMakerImportFilter.cxx b/writerperfect/source/draw/PageMakerImportFilter.cxx
index e3f9cabad9d5..1d4c5762d42e 100644
--- a/writerperfect/source/draw/PageMakerImportFilter.cxx
+++ b/writerperfect/source/draw/PageMakerImportFilter.cxx
@@ -12,7 +12,7 @@
 #include <libpagemaker/libpagemaker.h>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-
+#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 #include "PageMakerImportFilter.hxx"
diff --git a/writerperfect/source/draw/QXPImportFilter.cxx b/writerperfect/source/draw/QXPImportFilter.cxx
index f0f71fcba310..ae97223f2cda 100644
--- a/writerperfect/source/draw/QXPImportFilter.cxx
+++ b/writerperfect/source/draw/QXPImportFilter.cxx
@@ -12,7 +12,7 @@
 #include <libqxp/libqxp.h>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-
+#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 #include "QXPImportFilter.hxx"
diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
index bdfe3d361c4e..22886a2db8bc 100644
--- a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
+++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include <libstaroffice/libstaroffice.hxx>
 #include <libodfgen/libodfgen.hxx>
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index 8c72b732c7c4..c49fed230c4e 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <libvisio/libvisio.h>
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index 7ed726fb62ba..a7fb552deeba 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -14,6 +14,7 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <libodfgen/libodfgen.hxx>
diff --git a/writerperfect/source/draw/ZMFImportFilter.cxx b/writerperfect/source/draw/ZMFImportFilter.cxx
index e44a952053e1..24552b012fb3 100644
--- a/writerperfect/source/draw/ZMFImportFilter.cxx
+++ b/writerperfect/source/draw/ZMFImportFilter.cxx
@@ -12,7 +12,7 @@
 #include <libzmf/libzmf.h>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-
+#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 #include "ZMFImportFilter.hxx"
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx
index 3083790e4f9c..dbb7ab563c21 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <memory>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
index 46c3ec7f3545..ee47e5f3de94 100644
--- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
+++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
@@ -10,6 +10,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include <libmwaw/libmwaw.hxx>
 #include <libodfgen/libodfgen.hxx>
diff --git a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx
index 1a6c5255aea6..b6f4c1f61394 100644
--- a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx
+++ b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include <libstaroffice/libstaroffice.hxx>
 #include <libodfgen/libodfgen.hxx>
diff --git a/writerperfect/source/writer/AbiWordImportFilter.cxx b/writerperfect/source/writer/AbiWordImportFilter.cxx
index 8f0f5162a819..5ee8cbee51b8 100644
--- a/writerperfect/source/writer/AbiWordImportFilter.cxx
+++ b/writerperfect/source/writer/AbiWordImportFilter.cxx
@@ -10,6 +10,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include <libabw/libabw.h>
 
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index 852c71aebdf1..1e22af75deb3 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -10,6 +10,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <sal/log.hxx>
 
 #include <libe-book/libe-book.h>
diff --git a/writerperfect/source/writer/EPUBExportDialog.hxx b/writerperfect/source/writer/EPUBExportDialog.hxx
index 6d228130adc4..50a6de75eec5 100644
--- a/writerperfect/source/writer/EPUBExportDialog.hxx
+++ b/writerperfect/source/writer/EPUBExportDialog.hxx
@@ -12,6 +12,7 @@
 
 #include <vcl/weld.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
 
 namespace comphelper
 {
diff --git a/writerperfect/source/writer/EPUBExportUIComponent.cxx b/writerperfect/source/writer/EPUBExportUIComponent.cxx
index a34655802d7f..0e6ae812f5a7 100644
--- a/writerperfect/source/writer/EPUBExportUIComponent.cxx
+++ b/writerperfect/source/writer/EPUBExportUIComponent.cxx
@@ -9,6 +9,7 @@
 
 #include "EPUBExportUIComponent.hxx"
 
+#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <comphelper/namedvaluecollection.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index b67a6e14f4ac..dcef9c2df10b 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -10,6 +10,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <sal/log.hxx>
 
 #include <libwps/libwps.h>
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
index ad12a6a677d1..780cd040b713 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -10,6 +10,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include <libmwaw/libmwaw.hxx>
 
diff --git a/writerperfect/source/writer/PagesImportFilter.cxx b/writerperfect/source/writer/PagesImportFilter.cxx
index bcd502fb8bf3..b2de122dfe6a 100644
--- a/writerperfect/source/writer/PagesImportFilter.cxx
+++ b/writerperfect/source/writer/PagesImportFilter.cxx
@@ -12,6 +12,7 @@
 #include <libetonyek/libetonyek.h>
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include "PagesImportFilter.hxx"
 
diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx
index 53869bb1a235..25a48687da2c 100644
--- a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx
+++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 
 #include <libstaroffice/libstaroffice.hxx>