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>
2018-11-25 00:53:41 +01:00 · 2018-11-25 00:53:41 +01:00 · a96e6e8062
commit a96e6e8062
parent b5cd5296ff
145 changed files with 159 additions and 58 deletions
--- 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;
--- 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>
--- 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
 {
--- 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
 {
--- 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>
--- 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
 {
--- 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;
--- 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"
--- 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>
--- 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>
--- 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>
--- 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"

--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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 ==================================

--- 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 ==================================

--- 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;

--- 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>

--- 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;
--- 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;

--- 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;
--- 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"

--- 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>
--- 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
 {
--- 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:
--- 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
+
--- 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>
--- 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>
--- 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
 {
--- 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.
--- 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
 {
--- a/include/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
@ -41,8 +41,6 @@ namespace utl {

 class LocaleDataWrapper;

-class Date;
-
 namespace vcl
 {

--- 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
 {
--- 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;
--- 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))
--- 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
--- 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
 {
--- 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>
--- 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>

--- 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;
--- 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>
--- 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
 {
    /*
--- 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
--- 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;
--- 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
 {
--- 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;

--- 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;
--- 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
--- 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>
--- 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>
--- 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>
--- 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;
--- 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>

--- 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"

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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

--- 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>
--- 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>
--- 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;
--- 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>
--- 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
--- 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;
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"

--- 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>
--- 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; } } } }
--- 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;

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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>

--- 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>
--- 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>

--- a/Show More
+++ b/Show More