tdf#42949 Fix IWYU warnings in include/svx/[h-r]*

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

Change-Id: Ib7e1d0f7483aa8b5cab320278714f2d5f36fdbd9
Reviewed-on: https://gerrit.libreoffice.org/72534
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index e0fdacb..8a4ec23 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -23,6 +23,7 @@

#include <unotools/lingucfg.hxx>
#include <editeng/langitem.hxx>
#include <svl/intitem.hxx>
#include <svl/itempool.hxx>
#include <svx/obj3d.hxx>
#include <svx/svdpagv.hxx>
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index c1a1869..dda1de5 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -27,6 +27,7 @@
#include <editeng/numdef.hxx>
#include <editeng/svxenum.hxx>
#include <svtools/ctrlbox.hxx>
#include <vcl/customweld.hxx>

#define MN_GALLERY_ENTRY 100

diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index b9fd2a0..0347f7a 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -19,6 +19,7 @@

#include <unotools/pathoptions.hxx>
#include "optchart.hxx"
#include <svx/SvxColorValueSet.hxx>
#include <vcl/weld.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 8902601..b2b9430 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -69,6 +69,7 @@
#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <unotools/syslocale.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 21f5951..e5b9706 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -34,6 +34,7 @@
#include <QueryDesignView.hxx>
#include <vcl/settings.hxx>
#include <cppuhelper/implbase.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 8ed6ad6..ab8ed4c 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -53,6 +53,7 @@
#include <UITools.hxx>
#include <querycontainerwindow.hxx>
#include <sqlmessage.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <memory>
#include <set>
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 1baa163..deaedd8 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -41,6 +41,7 @@
#include <sqlmessage.hxx>
#include <UITools.hxx>
#include <osl/diagnose.h>
#include <i18nlangtag/languagetag.hxx>
#include <vcl/treelistentry.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/svapp.hxx>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index d7b4e83..c30f404 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -96,6 +96,7 @@
#include <svx/numinf.hxx>
#include <svx/svxdlg.hxx>
#include <svx/svxids.hrc>
#include <vcl/graph.hxx>
#include <vcl/unohelp.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/stdtext.hxx>
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 5b83d17..8dbddea 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -100,6 +100,7 @@
#include <svx/svdopath.hxx>
#include <svx/xlntrit.hxx>
#include <svx/xflbmtit.hxx>
#include <svx/xflclit.hxx>
#include <svx/xfltrit.hxx>
#include <svx/xflbmsxy.hxx>
#include <svx/xflbmsli.hxx>
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 1d2f369..632a60b 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -56,6 +56,7 @@
#include <svx/svdotable.hxx>
#include <svx/xflbstit.hxx>
#include <svx/xflbmtit.hxx>
#include <svx/xflclit.hxx>
#include <svx/xfltrit.hxx>
#include <editeng/outlobj.hxx>
#include <editeng/numdef.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index e654efeff..353cc15 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -974,3 +974,9 @@ blacklist:
    include/svx/fmtools.hxx:
    # base class has to be a complete type
    - com/sun/star/lang/XEventListener.hpp
    include/svx/ifaceids.hxx:
    # Keep for macro define
    - sfx2/shell.hxx
    include/svx/measctrl.hxx:
    # Needed for template class
    - svx/svdobj.hxx
diff --git a/include/svx/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx
index 23b22b3..4d52476 100644
--- a/include/svx/EnhancedCustomShapeGeometry.hxx
+++ b/include/svx/EnhancedCustomShapeGeometry.hxx
@@ -22,6 +22,7 @@

#include <sal/types.h>
#include <svx/msdffdef.hxx>
#include <svx/svxdllapi.h>
#include <o3tl/typed_flags_set.hxx>

struct SvxMSDffVertPair
diff --git a/include/svx/EnhancedCustomShapeTypeNames.hxx b/include/svx/EnhancedCustomShapeTypeNames.hxx
index b91e1eb..bf90495 100644
--- a/include/svx/EnhancedCustomShapeTypeNames.hxx
+++ b/include/svx/EnhancedCustomShapeTypeNames.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SVX_ENHANCEDCUSTOMSHAPETYPENAMES_HXX
#define INCLUDED_SVX_ENHANCEDCUSTOMSHAPETYPENAMES_HXX
#include <svx/msdffdef.hxx>
#include <svx/svxdllapi.h>
#include <rtl/ustring.hxx>

namespace EnhancedCustomShapeTypeNames
diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx
index ab00645..19284a7 100644
--- a/include/svx/IAccessibleParent.hxx
+++ b/include/svx/IAccessibleParent.hxx
@@ -20,10 +20,13 @@
#ifndef INCLUDED_SVX_IACCESSIBLEPARENT_HXX
#define INCLUDED_SVX_IACCESSIBLEPARENT_HXX

#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <sal/types.h>
#include <svx/AccessibleControlShape.hxx>
#include <com/sun/star/uno/Reference.hxx>

namespace accessibility { class AccessibleControlShape; }
namespace com::sun::star::accessibility { class XAccessible; }
namespace com::sun::star::beans { class XPropertySet; }
namespace com::sun::star::drawing { class XShape; }

namespace accessibility {

class AccessibleShape;
diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx
index 1b22866..247e29c 100644
--- a/include/svx/IAccessibleViewForwarder.hxx
+++ b/include/svx/IAccessibleViewForwarder.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_IACCESSIBLEVIEWFORWARDER_HXX
#define INCLUDED_SVX_IACCESSIBLEVIEWFORWARDER_HXX

#include <sal/types.h>
#include <tools/gen.hxx>


diff --git a/include/svx/IAccessibleViewForwarderListener.hxx b/include/svx/IAccessibleViewForwarderListener.hxx
index b4195d1..d22c0db 100644
--- a/include/svx/IAccessibleViewForwarderListener.hxx
+++ b/include/svx/IAccessibleViewForwarderListener.hxx
@@ -20,13 +20,9 @@
#ifndef INCLUDED_SVX_IACCESSIBLEVIEWFORWARDERLISTENER_HXX
#define INCLUDED_SVX_IACCESSIBLEVIEWFORWARDERLISTENER_HXX

#include <sal/types.h>


namespace accessibility {

class IAccessibleViewForwarder;

/** <p>The purpose of this interface is to notify a user of an
    IAccessibleViewForwarder when that view forwarder changes its
    properties.  Such a change may be one of the following:
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index 3b9835b..f66d06b 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -19,11 +19,12 @@
#ifndef INCLUDED_SVX_PALETTE_HXX
#define INCLUDED_SVX_PALETTE_HXX

#include <svx/SvxColorValueSet.hxx>
#include <svx/xtable.hxx>
#include <rtl/ustring.hxx>
#include <svx/svxdllapi.h>

class Color;
class ColorValueSet;
class SvxColorValueSet;

typedef std::pair<Color, OUString> NamedColor;

diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index 486edd9..e7c7cb1 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -19,19 +19,19 @@
#ifndef INCLUDED_SVX_PALETTEMANAGER_HXX
#define INCLUDED_SVX_PALETTEMANAGER_HXX

#include <svx/SvxColorValueSet.hxx>
#include <svx/Palette.hxx>
#include <rtl/ustring.hxx>
#include <svx/tbxcolorupdate.hxx>

#include <tools/urlobj.hxx>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <svx/xtable.hxx>

#include <deque>
#include <vector>
#include <memory>

class SvxColorValueSet;
namespace com::sun::star::uno { class XComponentContext; }
namespace svx { class ToolboxButtonColorUpdater; }
namespace weld { class Window; }

class SVX_DLLPUBLIC PaletteManager
{
    const sal_uInt16        mnMaxRecentColors;
diff --git a/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx
index 293253e..b666628 100644
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ b/include/svx/ParaLineSpacingPopup.hxx
@@ -19,12 +19,8 @@
#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX

#include <editeng/lspcitem.hxx>
#include <vcl/EnumContext.hxx>
#include <sfx2/tbxctrl.hxx>
#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
#include <tools/fldunit.hxx>

namespace svx {

diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx
index cefcc81..382c0e4 100644
--- a/include/svx/ParaSpacingControl.hxx
+++ b/include/svx/ParaSpacingControl.hxx
@@ -21,10 +21,11 @@

#include <sfx2/tbxctrl.hxx>
#include <svx/svxdllapi.h>
#include <vcl/window.hxx>
#include <com/sun/star/ui/XContextChangeEventListener.hpp>
#include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp>
#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>

namespace com::sun::star::ui { class XContextChangeEventMultiplexer; }
namespace com::sun::star::ui { struct ContextChangeEventObject; }
namespace vcl { class Window; }

namespace svx {

diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx
index cc188ac..2f6b274 100644
--- a/include/svx/ParseContext.hxx
+++ b/include/svx/ParseContext.hxx
@@ -19,10 +19,11 @@
#ifndef INCLUDED_SVX_PARSECONTEXT_HXX
#define INCLUDED_SVX_PARSECONTEXT_HXX

#include <com/sun/star/lang/Locale.hpp>

#include <connectivity/IParseContext.hxx>
#include <rtl/ustring.hxx>
#include <svx/svxdllapi.h>
#include <unotools/localedatawrapper.hxx>
#include <vector>

namespace svxform
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 4114042..b6ae656 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -20,27 +20,16 @@
#ifndef INCLUDED_SVX_CTREDLIN_HXX
#define INCLUDED_SVX_CTREDLIN_HXX

#include <comphelper/string.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <svx/svxdllapi.h>
#include <svtools/simptabl.hxx>
#include <svtools/ctrlbox.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistbox.hxx>
#include <vcl/treelistentry.hxx>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/link.hxx>
#include <tools/time.hxx>
#include <tools/wintypes.hxx>
#include <vcl/builder.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/weld.hxx>
#include <memory>

namespace utl {
@@ -48,16 +37,11 @@ namespace utl {
    class TextSearch;
}

namespace vcl { class Window; }
namespace comphelper::string { class NaturalStringSorter; }

class DateField;
class Edit;
class FixedText;
class ListBox;
class Point;
class SvViewDataEntry;
class TimeField;
struct SvSortData;
class SvtCalendarBox;

enum class SvxRedlinDateMode
{
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 5247a86..1c65b64 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SVX_E3DUNDO_HXX
#define INCLUDED_SVX_E3DUNDO_HXX

#include <svl/itemset.hxx>
#include <svx/svdundo.hxx>
#include <svx/obj3d.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index 5e9d052..deb5687 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -20,8 +20,14 @@
#ifndef INCLUDED_SVX_EXTRUD3D_HXX
#define INCLUDED_SVX_EXTRUD3D_HXX

#include <svl/intitem.hxx>
#include <svl/itemset.hxx>
#include <svx/obj3d.hxx>
#include <svx/svxdllapi.h>
#include <svx/svddef.hxx>
#include <svx/svx3ditems.hxx>

class E3dDefaultAttributes;

/*************************************************************************
|*
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 2a307ec..a062476 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -21,16 +21,14 @@

#include <sfx2/tabdlg.hxx>

#include <vcl/customweld.hxx>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>

#include <svx/pagectrl.hxx>
#include <svx/svxdllapi.h>
#include <memory>

namespace weld { class CustomWeld; }

namespace svx
{
    SVX_DLLPUBLIC bool ShowBorderBackgroundDlg(weld::Window* pParent, SfxItemSet* pBBSet);
diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx
index b9af1f2..e8a4a9e 100644
--- a/include/svx/helperhittest3d.hxx
+++ b/include/svx/helperhittest3d.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_HELPERHITTEST3D_HXX

#include <svx/svxdllapi.h>
#include <sal/types.h>
#include <vector>


diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx
index f47f50f..515f070 100644
--- a/include/svx/hexcolorcontrol.hxx
+++ b/include/svx/hexcolorcontrol.hxx
@@ -20,13 +20,13 @@
#ifndef INCLUDED_SVX_HEXCOLOR_HXX
#define INCLUDED_SVX_HEXCOLOR_HXX

#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <vcl/weld.hxx>
#include <sot/exchange.hxx>
#include <sax/tools/converter.hxx>
#include <svx/svxdllapi.h>
#include <tools/color.hxx>
#include <tools/link.hxx>

namespace weld { class Entry; }

struct ImplSVEvent;

namespace weld {

diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index d2b1cf6..1630c01 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -20,19 +20,25 @@
#ifndef INCLUDED_SVX_IMAPDLG_HXX
#define INCLUDED_SVX_IMAPDLG_HXX

#include <svtools/inettbc.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/ctrlitem.hxx>
#include <sfx2/basedlgs.hxx>
#include <vcl/customweld.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/status.hxx>
#include <vcl/weld.hxx>
#include <svx/svxdllapi.h>
#include <memory>
#include <vector>

namespace vcl { class Window; }
namespace weld { class Button; }
namespace weld { class ComboBox; }
namespace weld { class CustomWeld; }
namespace weld { class Entry; }
namespace weld { class Label; }
namespace weld { class Toolbar; }
namespace weld { class Widget; }
namespace weld { class Window; }

class ImageMap;
class URLBox;

/*************************************************************************
|*
diff --git a/include/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx
index a65a5d8..4e1ef91 100644
--- a/include/svx/ipolypolygoneditorcontroller.hxx
+++ b/include/svx/ipolypolygoneditorcontroller.hxx
@@ -23,7 +23,6 @@
#include <sal/config.h>

#include <sal/types.h>
#include <svx/svxdllapi.h>


//   Defines
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index efeebed..19660d2 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -19,13 +19,11 @@
#ifndef INCLUDED_SVX_ITEMWIN_HXX
#define INCLUDED_SVX_ITEMWIN_HXX

#include <vcl/bitmap.hxx>
#include <vcl/field.hxx>

#include <svx/dlgctrl.hxx>
#include <svx/svxdllapi.h>

class XLineColorItem;
class XLineWidthItem;
class SfxObjectShell;

diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index 719c369..4313e74 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -20,8 +20,14 @@
#ifndef INCLUDED_SVX_LATHE3D_HXX
#define INCLUDED_SVX_LATHE3D_HXX

#include <svl/intitem.hxx>
#include <svl/itemset.hxx>
#include <svx/obj3d.hxx>
#include <svx/svxdllapi.h>
#include <svx/svddef.hxx>
#include <svx/svx3ditems.hxx>

class E3dDefaultAttributes;

/*************************************************************************
|*
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index a2b1a48..c1b3410 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -20,17 +20,12 @@
#define INCLUDED_SVX_LINECTRL_HXX


#include <svtools/valueset.hxx>
#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
#include <svx/svxdllapi.h>
#include <svx/xtable.hxx>
#include <memory>

class XLineStyleItem;
class XLineDashItem;
class SvxLineBox;
class SvxMetricField;


// SvxLineStyleController:
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 4a4bd12..b722e95 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -22,7 +22,6 @@

#include <limits.h>
#include <sal/types.h>
#include <svx/svxdllapi.h>

#define DFF_COMMON_RECORD_HEADER_SIZE           8

diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index 2b7d36e..5e3e54c 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -26,7 +26,6 @@
#include <svl/zforlist.hxx>

#include <vector>
#include <map>

class Color;

diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index 0702fe2..b5bf135 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SVX_NUMINF_HXX
#define INCLUDED_SVX_NUMINF_HXX

#include <memory>
#include <svl/poolitem.hxx>
#include <svx/numfmtsh.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index cab7968..6f0c144 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -21,7 +21,6 @@

#include <vcl/idle.hxx>
#include <svtools/valueset.hxx>
#include <limits.h>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/lang/Locale.hpp>
@@ -39,9 +38,6 @@ namespace com{namespace sun{ namespace star{
    }
}}}

class SvxBrushItem;
class SvxNumRule;

enum class NumberingPageType
{
    BULLET,
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index f1c09d6..8916d145 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -22,29 +22,16 @@

#include <svx/svdoattr.hxx>
#include <svx/svdobj.hxx>
#include <svx/def3d.hxx>
#include <svx/svdpage.hxx>
#include <svx/deflt3d.hxx>
#include <vcl/bitmap.hxx>
#include <svx/svx3ditems.hxx>
#include <svx/xflclit.hxx>
#include <svl/itemset.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
#include <basegfx/range/b3drange.hxx>
#include <basegfx/polygon/b3dpolypolygon.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/vector/b2enums.hxx>
#include <svx/svxdllapi.h>

// Forward declarations
class SfxPoolItem;
class Viewport3D;
class E3dScene;

namespace basegfx { class B3DPolyPolygon; }
namespace sdr { namespace properties {
    class BaseProperties;
    class E3dProperties;
    class E3dCompoundProperties;
    class E3dExtrudeProperties;
    class E3dLatheProperties;
diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx
index 8c9761e..19f7074 100644
--- a/include/svx/objfac3d.hxx
+++ b/include/svx/objfac3d.hxx
@@ -30,7 +30,6 @@
|*
\************************************************************************/

class SdrObjFactory;
class SdrObject;
struct SdrObjCreatorParams;

diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 1e4f62c..df86d32 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -20,11 +20,13 @@
#define INCLUDED_SVX_OPTGRID_HXX

#include <sfx2/tabdlg.hxx>
#include <svl/eitem.hxx>
#include <vcl/weld.hxx>
#include <svx/svxdllapi.h>

class SvxGridTabPage;
namespace weld { class CheckButton; }
namespace weld { class MetricSpinButton; }
namespace weld { class SpinButton; }
namespace weld { class ToggleButton; }
namespace weld { class Widget; }

class SVX_DLLPUBLIC SvxOptionsGrid
{
diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index 3da3950..b5abe5c 100644
--- a/include/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
@@ -20,11 +20,9 @@
#define INCLUDED_SVX_PAGECTRL_HXX

#include <vcl/customweld.hxx>
#include <vcl/window.hxx>
#include <svx/svxdllapi.h>
#include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>

class SvxBoxItem;
enum class SvxPageUsage;
enum class SvxFrameDirection;

diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx
index e650173..f605584 100644
--- a/include/svx/paraprev.hxx
+++ b/include/svx/paraprev.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_PARAPREV_HXX

#include <vcl/customweld.hxx>
#include <vcl/window.hxx>
#include <editeng/svxenum.hxx>
#include <svx/svxdllapi.h>

diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx
index 1e5da71..c0b4758 100644
--- a/include/svx/postattr.hxx
+++ b/include/svx/postattr.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SVX_POSTATTR_HXX
#define INCLUDED_SVX_POSTATTR_HXX

#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <svx/svxdllapi.h>

diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx
index d7c57be..d22e0ba 100644
--- a/include/svx/pszctrl.hxx
+++ b/include/svx/pszctrl.hxx
@@ -23,7 +23,6 @@
#include <sfx2/stbitem.hxx>
#include <svx/svxdllapi.h>

class  SvxSizeItem;
struct SvxPosSizeStatusBarControl_Impl;

class SVX_DLLPUBLIC SvxPosSizeStatusBarControl : public SfxStatusBarControl
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index 4c914c6..d69c4f6 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SVX_RULER_HXX
#define INCLUDED_SVX_RULER_HXX

#include <vcl/menu.hxx>
#include <svtools/ruler.hxx>
#include <svl/lstner.hxx>
#include <svx/svxdllapi.h>
@@ -27,6 +26,7 @@

#include <memory>

class Menu;
class SvxProtectItem;
class SvxRulerItem;
class SfxBindings;
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 993cd2e..b3432db 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -22,8 +22,10 @@

#include <svx/camera3d.hxx>
#include <tools/b3dtrans.hxx>
#include <svx/svdpage.hxx>
#include <svx/svxdllapi.h>
#include <svx/obj3d.hxx>
#include <svx/svx3ditems.hxx>
#include <memory>

namespace sdr { namespace properties {
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index ae05492..345ae19 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -20,8 +20,13 @@
#ifndef INCLUDED_SVX_SPHERE3D_HXX
#define INCLUDED_SVX_SPHERE3D_HXX

#include <svl/intitem.hxx>
#include <svl/itemset.hxx>
#include <svx/obj3d.hxx>
#include <svx/svxdllapi.h>
#include <svx/svddef.hxx>

class E3dDefaultAttributes;

/**
 * SphereObject with diameter r3DSize.
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 0378eb3..34ed1c9 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -138,6 +138,8 @@ class SdrVertShearAllItem;
class SdrVertShearOneItem;
class SdrYesNoItem;
class SfxBoolItem;
class SfxUInt16Item;
class SfxUInt32Item;
class SfxStringItem;
class SfxVoidItem;
class Svx3DCharacterModeItem;
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index d57f785..c04fa55 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -23,6 +23,7 @@
#include <unotools/collatorwrapper.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/basedlgs.hxx>
#include <vcl/commandevent.hxx>

#include <acredlin.hxx>
#include <global.hxx>
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index e4a10483..2033e8f 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -28,6 +28,7 @@
#include <units.hrc>
#include <appoptio.hxx>
#include <scmod.hxx>
#include <svl/eitem.hxx>
#include <svx/colorbox.hxx>
#include <svtools/unitconv.hxx>

diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 8130d1c..d66c141 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -45,6 +45,7 @@
#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
#include <osl/diagnose.h>
#include <tools/stream.hxx>

using namespace com::sun::star;

diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 062ef72..8f522d8 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -18,6 +18,7 @@
 */

#include <fusldlg.hxx>
#include <svl/eitem.hxx>
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 7de7672..d00f125 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -44,6 +44,7 @@
#include <svx/svdorect.hxx>
#include <svx/svdograf.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <editeng/eeitem.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/svx/inc/palettes.hxx b/svx/inc/palettes.hxx
index 028efad..c02ffae 100644
--- a/svx/inc/palettes.hxx
+++ b/svx/inc/palettes.hxx
@@ -20,6 +20,8 @@
#define INCLUDED_SVX_INC_PALETTE_HXX

#include <svx/Palette.hxx>
#include <svx/SvxColorValueSet.hxx>
#include <svx/xtable.hxx>

class SvFileStream;

diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 88b03e5..f3af5cc 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -23,6 +23,7 @@

#include "ChildrenManagerImpl.hxx"
#include <svx/ShapeTypeHandler.hxx>
#include <svx/AccessibleControlShape.hxx>
#include <svx/AccessibleShapeInfo.hxx>
#include <svx/IAccessibleViewForwarder.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 8d7a9d3..d34e2d1 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -18,6 +18,7 @@
 */

#include "EnhancedCustomShape3d.hxx"
#include <svx/deflt3d.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdmodel.hxx>
#include <tools/poly.hxx>
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index c519ef1f..22595f9 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -18,10 +18,12 @@
 */

#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <svtools/ctrlbox.hxx>
#include <unotools/textsearch.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/viewdataentry.hxx>
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 7dea82c..c7f2474 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -32,6 +32,7 @@
#include <svx/helperhittest3d.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <svx/polygn3d.hxx>
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xlnwtit.hxx>
#include <helpids.h>
diff --git a/svx/source/dialog/hexcolorcontrol.cxx b/svx/source/dialog/hexcolorcontrol.cxx
index 70e32e5..f1c0715 100644
--- a/svx/source/dialog/hexcolorcontrol.cxx
+++ b/svx/source/dialog/hexcolorcontrol.cxx
@@ -17,9 +17,11 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

#include <sax/tools/converter.hxx>
#include <svx/hexcolorcontrol.hxx>
#include <rtl/character.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>

namespace weld {

diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index b1dcd35..7fccc33 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -30,6 +30,7 @@
#include <svl/urihelper.hxx>
#include <svtools/miscopt.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/inettbc.hxx>
#include <svtools/sfxecode.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/objsh.hxx>
@@ -49,6 +50,7 @@
#include <svx/svdopath.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/status.hxx>
#include <vcl/builderfactory.hxx>
#include "dlgunit.hxx"
#include <memory>
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index d7b1002..0ad090a 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <vcl/bitmap.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/outdev.hxx>
#include <vcl/settings.hxx>
#include <tools/fract.hxx>
#include <editeng/frmdiritem.hxx>
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index fd3ee56..641e9ad4 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -19,6 +19,7 @@

#include <sfx2/dialoghelper.hxx>
#include <svx/paraprev.hxx>
#include <vcl/outdev.hxx>
#include <vcl/settings.hxx>

SvxParaPrevWindow::SvxParaPrevWindow() :
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 048170d..8d2758f 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -19,6 +19,7 @@


#include <svx/strings.hrc>
#include <svx/deflt3d.hxx>
#include <svx/dialmgr.hxx>
#include <svx/cube3d.hxx>
#include <svx/globl3d.hxx>
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 05089ab..a631659 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -19,6 +19,7 @@


#include <svx/strings.hrc>
#include <svx/deflt3d.hxx>
#include <svx/dialmgr.hxx>
#include <svx/svdpage.hxx>
#include <svx/globl3d.hxx>
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 99d4edd..8773b91 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -18,6 +18,7 @@
 */


#include <svx/deflt3d.hxx>
#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
#include <tools/poly.hxx>
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index ecd6b37..4beaf3b 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -19,6 +19,7 @@


#include <svx/strings.hrc>
#include <svx/deflt3d.hxx>
#include <svx/dialmgr.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 02e98c6..e4d4bf6 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -75,7 +75,7 @@
#include <vcl/menu.hxx>
#include <vcl/settings.hxx>
#include <sal/log.hxx>

#include <i18nlangtag/languagetag.hxx>
#include <math.h>
#include <memory>

diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index bf74bab..e16b614 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -24,6 +24,7 @@

#include <svx/dialmgr.hxx>

#include <i18nlangtag/languagetag.hxx>
#include <unotools/syslocale.hxx>
#include <vcl/svapp.hxx>
#include <osl/diagnose.h>
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index c7b7553..1fbe04e 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -37,6 +37,7 @@
#include <connectivity/dbtools.hxx>
#include <connectivity/sqlnode.hxx>
#include <cppuhelper/implbase.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <fmservs.hxx>
#include <fmshimp.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 82e0873..9b689c2 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -94,6 +94,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/weld.hxx>
#include <vcl/waitobj.hxx>
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index db5fc8c..c1d71ea 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -82,6 +82,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/localedatawrapper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/window.hxx>
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index 2315542..ac2cb70 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -22,6 +22,10 @@

#include <svx/ParseContext.hxx>

#include <com/sun/star/uno/XComponentContext.hpp>

#include <memory>

namespace com { namespace sun { namespace star {
namespace util {
    class XNumberFormatter;
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index 4920c79..cea47f6 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -19,6 +19,7 @@

#include "ParaLineSpacingControl.hxx"

#include <editeng/lspcitem.hxx>
#include <svx/ParaLineSpacingPopup.hxx>
#include <unotools/viewoptions.hxx>
#include <vcl/toolbox.hxx>
diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
index 6b402c3..7e703d3 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
@@ -30,6 +30,8 @@
#include <comphelper/processfactory.hxx>

#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp>
#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>

using namespace svx;

diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx
index cf9191c..7cbdbc1 100644
--- a/svx/source/svdraw/sdrhittesthelper.cxx
+++ b/svx/source/svdraw/sdrhittesthelper.cxx
@@ -21,6 +21,7 @@
#include <svx/sdrhittesthelper.hxx>
#include <svx/obj3d.hxx>
#include <svx/helperhittest3d.hxx>
#include <svx/svdpage.hxx>
#include <svx/sdrpagewindow.hxx>
#include <svx/sdr/contact/viewobjectcontact.hxx>
#include <svx/sdr/contact/displayinfo.hxx>
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 14abc87..22efc51 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -28,6 +28,7 @@
#include <svx/svdetc.hxx>
#include <svx/scene3d.hxx>
#include <svx/view3d.hxx>
#include <svx/xflclit.hxx>
#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
#include <svx/sdr/contact/displayinfo.hxx>
#include <svx/svdouno.hxx>
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index b6a5e3b..ea08590 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -18,6 +18,7 @@
 */


#include <tools/debug.hxx>
#include <svx/svddrgv.hxx>
#include <svx/svdview.hxx>
#include <svx/xpoly.hxx>
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 1966875..17821df 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -42,6 +42,7 @@
#include <svx/obj3d.hxx>
#include <svx/svddrgmt.hxx>
#include <svx/svdotable.hxx>
#include <tools/debug.hxx>
#include <tools/tenccvt.hxx>
#include <svx/sdr/overlay/overlaypolypolygon.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index 17afd89..a62d6f0 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -19,6 +19,7 @@

#include <memory>
#include <svx/PaletteManager.hxx>
#include <tools/urlobj.hxx>
#include <osl/file.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/objsh.hxx>
@@ -26,6 +27,7 @@
#include <svx/strings.hrc>
#include <svx/svxids.hrc>
#include <svx/dialmgr.hxx>
#include <svx/tbxcolorupdate.hxx>
#include <vcl/toolbox.hxx>
#include <svtools/colrdlg.hxx>
#include <vcl/svapp.hxx>
@@ -37,6 +39,8 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/util/URLTransformer.hpp>

#include <palettes.hxx>

diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 8e510e0..e09e812 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -26,6 +26,7 @@

#include <svtools/toolbarmenu.hxx>
#include <svtools/popupwindowcontroller.hxx>
#include <svtools/valueset.hxx>

#include <svx/strings.hrc>
#include <svx/svxids.hrc>
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index 5beebe1..6ff14fd 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -30,6 +30,7 @@
#include <editeng/frmdiritem.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/graph.hxx>
#include <vcl/outdev.hxx>
#include <vcl/settings.hxx>
#include <tgrditem.hxx>
#include <viewopt.hxx>
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 65a3db3..30493a5 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -24,6 +24,8 @@
#include <sfx2/dispatch.hxx>
#include <svx/ctredlin.hxx>
#include <svx/postattr.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/lstbox.hxx>
#include <swtypes.hxx>
#include <wrtsh.hxx>
#include <view.hxx>