tdf#146619 Use more forward declarations in include/vcl/[a-o]

these were skipped in previous runs, since they contain some code behind #if After inspecting these, it seems like the removals should not cause trouble. Change-Id: I867ffc53254057e4bae43690214a2ab7ce0caa8f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197493 Reviewed-by: Gabor Kelemen <gabor.kelemen@collabora.com> Tested-by: Jenkins
2026-01-22 09:42:36 +01:00
parent cca3498787
commit 96cb87ca01
84 changed files with 142 additions and 19 deletions
@@ -32,6 +32,7 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <cppuhelper/exc_hlp.hxx>

@@ -18,6 +18,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <unotools/confignode.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/EnumContext.hxx>

@@ -26,6 +26,7 @@

 #include <cppuhelper/supportsservice.hxx>
 #include <utility>
+#include <vcl/bitmap.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <svl/outstrm.hxx>
 #include <svtools/DocumentToGraphicRenderer.hxx>
@@ -32,6 +32,7 @@
 #include <svx/sdtfsitm.hxx>
 #include <editeng/outlobj.hxx>
 #include <utility>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/svapp.hxx>
@@ -48,6 +48,7 @@

 #include <svx/unopage.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <vcl/window.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
@@ -40,6 +40,7 @@
 #include <com/sun/star/util/XURLTransformer.hpp>

 #include <rtl/ustring.hxx>
+#include <vcl/keycod.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/timer.hxx>
 #include <comphelper/compbase.hxx>
@@ -354,6 +354,9 @@ excludelist:
    - com/sun/star/frame/XTerminateListener.hpp
    - com/sun/star/datatransfer/dnd/XDragGestureListener.hpp
    - com/sun/star/datatransfer/dnd/XDropTargetListener.hpp
+    include/vcl/vectorgraphicdata.hxx:
+    # TODO Needed on Android NDK 27 for some reason
+    - com/sun/star/graphic/XPrimitive2D.hpp
    include/toolkit/awt/vclxwindow.hxx:
    # base class has to be a complete type
    - com/sun/star/awt/XWindow2.hpp
@@ -26,6 +26,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <framework/fwkdllapi.h>
 #include <memory>
+#include <vector>

 namespace osl { class Mutex; }

@@ -21,9 +21,12 @@

 #include <memory>
 #include <string_view>
+#include <basegfx/vector/b2dvector.hxx>
+#include <tools/poly.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/dllapi.h>
 #include <o3tl/typed_flags_set.hxx>
+#include <com/sun/star/uno/XInterface.hpp>

 #include <vcl/GraphicAttributes.hxx>

@@ -26,6 +26,7 @@

 #include <vcl/dllapi.h>
 #include <vcl/bitmap.hxx>
+#include <vcl/region.hxx>

 class VCL_DLLPUBLIC AlphaMask final
 {
@@ -25,6 +25,9 @@
 #include <vcl/timer.hxx>
 #include <vcl/bitmap.hxx>

+#include <vector>
+
+class SvStream;
 struct AnimationFrame;

 #define ANIMATION_TIMEOUT_ON_CLICK 2147483647L
@@ -22,16 +22,16 @@
 #include <sal/config.h>

 #include <basegfx/numeric/ftools.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/degree.hxx>
+#include <tools/gen.hxx>
 #include <vcl/checksum.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/mapmod.hxx>
-#include <vcl/region.hxx>
 #include <vcl/bitmap/BitmapTypes.hxx>
 #include <config_vclplug.h>

 #include <o3tl/typed_flags_set.hxx>
-#include <com/sun/star/uno/Sequence.hxx>

 #include <memory>

@@ -40,6 +40,12 @@ namespace basegfx { class BColorModifierStack; }
 namespace com::sun::star::rendering {
    class XBitmapCanvas;
 }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace com::sun::star::uno { template <typename> class Sequence; }
+namespace basegfx { class B2DHomMatrix; }
+namespace basegfx { class B2DRange; }
+namespace tools { class Polygon; }
+namespace vcl { class Region; }

 inline sal_uInt8 GAMMA(double _def_cVal, double _def_InvGamma)
 {
@@ -13,14 +13,12 @@
 #include <sal/log.hxx>
 #include <vcl/dllapi.h>
 #include <utility>
-#include <vcl/menu.hxx>
 #include <vcl/widgetbuilder.hxx>
 #include <vcl/window.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/toolboxid.hxx>
 #include <vcl/wintypes.hxx>
 #include <vcl/EnumContext.hxx>
-#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>

 #include <memory>
 #include <map>
@@ -36,12 +34,14 @@ class FormattedField;
 class ListBox;
 class MessageDialog;
 class NumericFormatter;
+class PopupMenu;
 class ScrollBar;
 class SvTabListBox;
 class Slider;
 class VclExpander;
 class VclMultiLineEdit;
 namespace com::sun::star::frame { class XFrame; }
+struct NotebookBarAddonsItem;

 /// Creates a hierarchy of vcl::Windows (widgets) from a .ui file for dialogs, sidebar, etc.
 class VCL_DLLPUBLIC VclBuilder final : public WidgetBuilder<vcl::Window, VclPtr<vcl::Window>, PopupMenu, VclPtr<PopupMenu>>
@@ -26,12 +26,22 @@
 #include <o3tl/lru_map.hxx>
 #include <vcl/glyphitem.hxx>
 #include <vcl/dropcache.hxx>
+#include <vcl/mapmod.hxx>
 #include <vcl/metric.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/vclptr.hxx>

 #include <optional>

+class OutputDevice;
+namespace vcl::text
+{
+class TextLayoutCache;
+}
+namespace vcl::text
+{
+enum class ComplexTextLayoutFlags : sal_uInt8;
+}
+template <class reference_type> class VclPtr;
+
 /**
 A cache for SalLayoutGlyphs objects.

@@ -20,28 +20,31 @@
 #ifndef INCLUDED_VCL_GRAPHICFILTER_HXX
 #define INCLUDED_VCL_GRAPHICFILTER_HXX

-#include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/graph.hxx>
-#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <comphelper/errcode.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <vcl/BinaryDataContainer.hxx>
 #include <vcl/graphic/GraphicMetadata.hxx>
-#include <vcl/gfxlink.hxx>
-#include <vcl/vectorgraphicdata.hxx>
+
+#include <com/sun/star/uno/Reference.hxx>

 #include <memory>
+#include <vector>

 namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace com::sun::star::task { class XInteractionHandler; }

+class BinaryDataContainer;
+class Graphic;
 class INetURLObject;

 class FilterConfigCache;
+class Size;
 class SvStream;
 struct ConvertData;
+enum class GfxLinkType;
+enum class VectorGraphicDataType;

 #define ERRCODE_GRFILTER_OPENERROR    ErrCode(ErrCodeArea::Vcl, ErrCodeClass::General, 1)
 #define ERRCODE_GRFILTER_IOERROR      ErrCode(ErrCodeArea::Vcl, ErrCodeClass::General, 2)
@@ -23,17 +23,14 @@
 #include <memory>
 #include <string_view>

-#include <comphelper/OAccessible.hxx>
+#include <rtl/ustring.hxx>
 #include <vcl/vclenum.hxx>
 #include <tools/link.hxx>
 #include <tools/long.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/keycod.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <tools/json_writer.hxx>
 #include <list>

 class OutputDevice;
@@ -56,9 +53,12 @@ struct SystemMenuData;
 enum class VclEventId;

 namespace com::sun::star::awt { class XPopupMenu; }
+namespace comphelper { class OAccessible; }
+namespace tools { class JsonWriter; }

 namespace vcl
 {
+class KeyCode;
 class Window;
 struct MenuLayoutData;
 typedef OutputDevice RenderContext; // same as in include/vcl/outdev.hxx
@@ -12,13 +12,15 @@

 #include <epoxy/gl.h>
 #include <sal/detail/log.h>
+#include <tools/long.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/bitmap.hxx>

 #include <rtl/ustring.hxx>
 #include <sstream>
 #include <string_view>

+class Bitmap;
+
 /// Helper to do a SAL_INFO as well as a GL log.
 #define VCL_GL_INFO(stream) \
    do { \
@@ -27,8 +27,7 @@
 #include <algorithm>
 #include <optional>

-namespace com::sun::star::graphic { class XPrimitive2D; }
-
+#include <com/sun/star/graphic/XPrimitive2D.hpp>

 // helper to convert any Primitive2DSequence to a good quality Bitmap,
 // using default parameters and graphic::XPrimitive2DRenderer
@@ -27,6 +27,8 @@
 #include <vcl/dllapi.h>
 #include <optional>

+class SvStream;
+
 enum class WallpaperStyle
 {
    NONE,
@@ -35,6 +35,7 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>

@@ -22,6 +22,7 @@
 #include <vcl/bitmap.hxx>
 #include <mutex>
 #include <memory>
+#include <vector>

 class SdrPage;

@@ -23,6 +23,7 @@
 #include <tools/color.hxx>

 #include <memory>
+#include <vector>

 namespace vcl { class Font; }

@@ -30,6 +30,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>
+#include <vcl/gfxlink.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/pdfread.hxx>
 #include <vcl/svapp.hxx>
@@ -21,6 +21,7 @@

 #include <vcl/builder.hxx>
 #include <vcl/toolbox.hxx>
+#include <com/sun/star/lang/XComponent.hpp>
 #include <map>

 namespace com::sun::star::frame { class XToolbarController; }
@@ -10,6 +10,7 @@
 #pragma once

 #include <sfx2/templateproperties.hxx>
+#include <vector>

 class TemplateContainerItem final
 {
@@ -31,6 +31,7 @@
 #include <sal/macros.h>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/strings.hrc>
+#include <vcl/keycod.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/image.hxx>
@@ -36,6 +36,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/event.hxx>
 #include <vcl/filter/PngImageReader.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/weld/weldutils.hxx>

@@ -24,6 +24,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/event.hxx>
+#include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -34,6 +34,8 @@

 #include <algorithm>
 #include <array>
+#include <float.h>
+#include <math.h>

 #include <comphelper/random.hxx>

@@ -18,6 +18,7 @@
 */

 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <svgfeimagenode.hxx>
@@ -21,7 +21,9 @@
 #include <svgdocument.hxx>
 #include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
@@ -17,6 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <vcl/gfxlink.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -26,6 +27,7 @@
 #include <svx/strings.hrc>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <vcl/weld/weld.hxx>

 #include <comphelper/processfactory.hxx>
@@ -20,6 +20,7 @@
 #include "dlgunit.hxx"
 #include <utility>
 #include <vcl/fieldvalues.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/virdev.hxx>
@@ -25,6 +25,7 @@
 #include <sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <utility>

 namespace drawinglayer::primitive2d
@@ -25,6 +25,8 @@
 #include <tools/debug.hxx>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
+#include <vcl/gfxlink.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <vcl/virdev.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/svdpntv.hxx>
@@ -17,6 +17,8 @@
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>

+#include <com/sun/star/uno/Sequence.hxx>
+
 SwBaselineGridConfig::SwBaselineGridConfig(SwMasterUsrPref& rParent)
    : ConfigItem(u"Office.Writer/BaselineGrid"_ustr)
    , m_rParent(rParent)
@@ -21,6 +21,7 @@
 #include <hintids.hxx>

 #include <svl/eitem.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/transfer.hxx>
 #include <sfx2/dispatch.hxx>
@@ -46,6 +46,8 @@
 #include <linguistic/misc.hxx>
 #include <rtl/string.hxx>
 #include <vcl/commandinfoprovider.hxx>
+#include <vcl/image.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
 #include <sfx2/dispatch.hxx>
@@ -22,6 +22,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
+#include <vcl/region.hxx>
 #include <vcl/vclptr.hxx>

 class Animation;
@@ -24,6 +24,8 @@
 #include <vcl/BitmapPalette.hxx>
 #include <tools/solar.h>

+#include <vector>
+
 struct OctreeNode
 {
    sal_uLong nCount = 0;
@@ -32,6 +32,8 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <vcl/ImageTree.hxx>

+class SvStream;
+
 namespace com::sun::star::container {
    class XNameAccess;
 }
@@ -17,6 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <comphelper/OAccessible.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/toolbox.hxx>
@@ -23,6 +23,7 @@

 #include <basegfx/numeric/ftools.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <comphelper/OAccessible.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <sal/macros.h>
 #include <tools/helpers.hxx>
@@ -48,6 +48,7 @@
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
+#include <vcl/themecolors.hxx>

 #include <osx/saldata.hxx>
 #include <osx/salinst.h>
@@ -27,6 +27,7 @@
 #include <tools/debug.hxx>
 #include <tools/long.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/keycod.hxx>
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
@@ -14,6 +14,7 @@
 #include <vcl/bitmap.hxx>

 #include <tools/stream.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>

 #include <BitmapSymmetryCheck.hxx>
@@ -16,6 +16,8 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>

+#include <vcl/bitmap.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <tools/color.hxx>
 #include <tools/mapunit.hxx>
@@ -16,6 +16,7 @@
 #include <unotest/bootstrapfixturebase.hxx>

 #include <vcl/GraphicNativeMetadata.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <tools/stream.hxx>

@@ -27,6 +27,7 @@
 #include <unotools/tempfile.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/metaactiontypes.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <vcl/wmf.hxx>
 #include "CommonTools.hxx"

@@ -21,6 +21,7 @@
 #include <basegfx/vector/b2dsize.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <tools/stream.hxx>

 #include <vcl/filter/PDFiumLibrary.hxx>
@@ -20,6 +20,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <comphelper/hash.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/vcompat.hxx>
@@ -18,6 +18,7 @@
 #include <comphelper/propertyvalue.hxx>

 #include <vcl/graphicfilter.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <tools/color.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -10,6 +10,7 @@
 #include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>
 #include <tools/stream.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
@@ -12,6 +12,7 @@
 #include <vcl/alpha.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <tools/stream.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <graphic/GraphicFormatDetector.hxx>
@@ -13,6 +13,8 @@
 #include <string_view>

 #include <unotest/bootstrapfixturebase.hxx>
+#include <vcl/gfxlink.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <tools/stream.hxx>
@@ -13,6 +13,8 @@
 #include <string_view>

 #include <unotest/bootstrapfixturebase.hxx>
+#include <vcl/gfxlink.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <tools/stream.hxx>
@@ -29,6 +29,7 @@
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/filter/ImportOutput.hxx>
 #include <unotools/tempfile.hxx>
@@ -59,6 +59,7 @@
 #include <vcl/headbar.hxx>
 #include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/toolkit/MenuButton.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <slider.hxx>
@@ -24,6 +24,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <tools/debug.hxx>
+#include <tools/json_writer.hxx>

 #include <vcl/builder.hxx>
 #include <vcl/event.hxx>
@@ -17,6 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <tools/json_writer.hxx>
 #include <vcl/help.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/event.hxx>
@@ -33,6 +33,7 @@
 #include <accessibility/vclxaccessiblecombobox.hxx>
 #include <listbox.hxx>
 #include <comphelper/lok.hxx>
+#include <tools/json_writer.hxx>
 #include <o3tl/string_view.hxx>

 struct ComboBoxBounds
@@ -21,11 +21,14 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/string_view.hxx>
 #include <officecfg/Office/Common.hxx>
+#include <tools/json_writer.hxx>

 #include <vcl/builder.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/dndlistenercontainer.hxx>
 #include <vcl/event.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <vcl/specialchars.hxx>
 #include <vcl/toolkit/edit.hxx>
@@ -15,6 +15,7 @@
 #include <vcl/builder.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/notebookbar/notebookbar.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/NotebookbarContextControl.hxx>
@@ -19,6 +19,7 @@

 #include <sal/config.h>

+#include <tools/json_writer.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/help.hxx>
@@ -29,6 +30,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/toolkit/button.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolkit/lstbox.hxx>
 #include <vcl/uitest/uiobject.hxx>
@@ -19,7 +19,9 @@

 #include <vcl/GraphicNativeTransform.hxx>

+#include <vcl/bitmap.hxx>
 #include <vcl/gfxlink.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -35,6 +35,7 @@
 #include <vcl/filter/PngImageReader.hxx>
 #include <vcl/filter/SvmWriter.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/vectorgraphicdata.hxx>
 #include <vcl/virdev.hxx>
 #include <impgraph.hxx>
@@ -17,6 +17,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
+#include <vcl/BinaryDataContainer.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <comphelper/configuration.hxx>
 #include <comphelper/scopeguard.hxx>
@@ -22,6 +22,7 @@
 #include <rtl/crc.h>

 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Sequence.hxx>

 namespace
 {
@@ -27,6 +27,8 @@

 #include <webp/encode.h>

+#include <vector>
+
 static int writerFunction(const uint8_t* data, size_t size, const WebPPicture* picture)
 {
    SvStream* stream = static_cast<SvStream*>(picture->custom_ptr);
@@ -20,6 +20,7 @@
 #include <impglyphitem.hxx>
 #include <utility>
 #include <vcl/glyphitemcache.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/vcllayout.hxx>
 #include <tools/lazydelete.hxx>
 #include <tools/stream.hxx>
@@ -12,6 +12,7 @@

 #include <com/sun/star/awt/XWindow.hpp>
 #include <unotools/ucbstreamhelper.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/weld/weld.hxx>

@@ -22,6 +22,7 @@
 #include <cppuhelper/weakagg.hxx>
 #include <tools/mapunit.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <cppuhelper/supportsservice.hxx>

@@ -34,6 +34,7 @@
 #include <osl/diagnose.h>
 #include <tools/stream.hxx>

+#include <deque>
 #include <memory>
 #include <map>
 #include <variant>
@@ -21,8 +21,10 @@

 #include <cstddef>

+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/notebookbar/NotebookBarAddonsMerger.hxx>
 #include <vcl/commandinfoprovider.hxx>
+#include <vcl/image.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/toolbox.hxx>
@@ -38,6 +38,7 @@
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/headbar.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/notebookbar/NotebookBarAddonsMerger.hxx>
 #include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
@@ -24,6 +24,7 @@
 #include <vcl/event.hxx>
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
@@ -23,6 +23,7 @@

 #include <comphelper/diagnose_ex.hxx>
 #include <sal/log.hxx>
+#include <tools/json_writer.hxx>

 #include <comphelper/types.hxx>
 #include <comphelper/lok.hxx>
@@ -21,6 +21,7 @@
 #include "menuitemlist.hxx"
 #include "menufloatingwindow.hxx"

+#include <comphelper/OAccessible.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/dockingarea.hxx>
 #include <vcl/settings.hxx>
@@ -22,6 +22,7 @@
 #include "menubarwindow.hxx"
 #include "bufferdevice.hxx"

+#include <comphelper/OAccessible.hxx>
 #include <sal/log.hxx>
 #include <salframe.hxx>
 #include <svdata.hxx>
@@ -22,6 +22,7 @@

 #include "menubarwindow.hxx"

+#include <comphelper/OAccessible.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <o3tl/safeint.hxx>
 #include <sal/config.h>
@@ -30,6 +31,7 @@
 #include <vcl/builder.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/mnemonic.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/menu.hxx>
@@ -75,6 +75,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/lok.hxx>
+#include <comphelper/OAccessible.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequence.hxx>
@@ -12,6 +12,7 @@
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/glomenu.h>
 #include <unx/gtk/gloactiongroup.h>
+#include <vcl/keycod.hxx>
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
@@ -34,6 +34,7 @@
 #include <o3tl/temporary.hxx>

 #include <dndhelper.hxx>
+#include <vcl/keycod.hxx>
 #include <vcl/inputtypes.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
@@ -20,8 +20,10 @@
 #include <sal/log.hxx>
 #include <sal/main.h>
 #include <comphelper/diagnose_ex.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/filter/pdfdocument.hxx>
 #include <comphelper/scopeguard.hxx>