summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/IwyuFilter_include.yaml5
-rw-r--r--include/sfx2/AccessibilityCheck.hxx3
-rw-r--r--include/sfx2/charmappopup.hxx1
-rw-r--r--include/sfx2/dinfdlg.hxx1
-rw-r--r--include/sfx2/emojipopup.hxx1
-rw-r--r--include/sfx2/frmhtml.hxx2
-rw-r--r--include/sfx2/sidebar/TabBar.hxx2
-rw-r--r--include/sfx2/tbxctrl.hxx1
-rw-r--r--include/sfx2/weldutils.hxx1
-rw-r--r--include/svl/aeitem.hxx4
-rw-r--r--include/svtools/framestatuslistener.hxx1
-rw-r--r--include/svtools/genericunodialog.hxx1
-rw-r--r--include/svtools/sampletext.hxx1
-rw-r--r--include/svtools/valueset.hxx1
-rw-r--r--include/svx/AccessibilityCheckDialog.hxx4
-rw-r--r--include/svx/DiagramDataInterface.hxx2
-rw-r--r--include/svx/Palette.hxx1
-rw-r--r--include/svx/ParaLineSpacingPopup.hxx1
-rw-r--r--include/svx/TextCharacterSpacingPopup.hxx1
-rw-r--r--include/svx/TextUnderlinePopup.hxx1
-rw-r--r--include/svx/bmpmask.hxx1
-rw-r--r--include/svx/charthelper.hxx2
-rw-r--r--include/svx/dialcontrol.hxx1
-rw-r--r--include/svx/framelinkarray.hxx2
-rw-r--r--include/svx/galctrl.hxx1
-rw-r--r--include/svx/galtheme.hxx2
-rw-r--r--include/svx/itemwin.hxx4
-rw-r--r--include/svx/layctrl.hxx1
-rw-r--r--include/svx/lboxctrl.hxx1
-rw-r--r--include/svx/legacyitem.hxx2
-rw-r--r--include/svx/sdgmoitm.hxx2
-rw-r--r--include/svx/sdr/animation/animationstate.hxx2
-rw-r--r--include/svx/sdr/attribute/sdrallfillattributeshelper.hxx2
-rw-r--r--include/svx/sdr/contact/viewcontact.hxx2
-rw-r--r--include/svx/sdr/contact/viewobjectcontact.hxx2
-rw-r--r--include/svx/sdr/contact/viewobjectcontactredirector.hxx2
-rw-r--r--include/svx/sdr/overlay/overlayobject.hxx2
-rw-r--r--include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx2
-rw-r--r--include/svx/selectioncontroller.hxx1
-rw-r--r--include/svx/shapepropertynotifier.hxx1
-rw-r--r--include/svx/sidebar/AreaPropertyPanelBase.hxx2
-rw-r--r--include/svx/sidebar/LinePropertyPanelBase.hxx2
-rw-r--r--include/svx/signaturelinehelper.hxx1
-rw-r--r--include/svx/svdograf.hxx2
-rw-r--r--include/svx/svdotext.hxx2
-rw-r--r--include/svx/tbcontrl.hxx1
-rw-r--r--include/svx/verttexttbxctrl.hxx2
-rw-r--r--include/svx/xpool.hxx1
-rw-r--r--include/test/xmldocptr.hxx1
-rw-r--r--include/toolkit/awt/vclxdevice.hxx1
-rw-r--r--include/toolkit/awt/vclxfont.hxx1
-rw-r--r--include/tools/UnitConversion.hxx2
-rw-r--r--include/tools/fract.hxx1
-rw-r--r--include/tools/gen.hxx1
-rw-r--r--include/tools/json_writer.hxx1
-rw-r--r--include/tools/mapunit.hxx3
-rw-r--r--include/ucbhelper/contentidentifier.hxx1
-rw-r--r--include/ucbhelper/propertyvalueset.hxx1
-rw-r--r--include/ucbhelper/providerhelper.hxx1
-rw-r--r--include/ucbhelper/resultset.hxx1
-rw-r--r--include/ucbhelper/resultsethelper.hxx1
-rw-r--r--include/ucbhelper/resultsetmetadata.hxx1
-rw-r--r--include/vbahelper/vbaaccesshelper.hxx1
-rw-r--r--include/vcl/BitmapTools.hxx2
-rw-r--r--include/vcl/GraphicAttributes.hxx2
-rw-r--r--include/vcl/NotebookBarAddonsMerger.hxx1
-rw-r--r--include/vcl/QueueInfo.hxx2
-rw-r--r--include/vcl/RawBitmap.hxx4
-rw-r--r--include/vcl/animate/AnimationBitmap.hxx1
-rw-r--r--include/vcl/dockwin.hxx1
-rw-r--r--include/vcl/edit.hxx1
-rw-r--r--include/vcl/field.hxx28
-rw-r--r--include/vcl/formatter.hxx2
-rw-r--r--include/vcl/gfxlink.hxx1
-rw-r--r--include/vcl/image.hxx1
-rw-r--r--include/vcl/imapobj.hxx1
-rw-r--r--include/vcl/layout.hxx5
-rw-r--r--include/vcl/naturalsort.hxx1
-rw-r--r--include/vcl/scopedbitmapaccess.hxx2
-rw-r--r--include/vcl/specialchars.hxx3
-rw-r--r--include/vcl/svapp.hxx1
-rw-r--r--include/vcl/sysdata.hxx4
-rw-r--r--include/vcl/syswin.hxx1
-rw-r--r--include/vcl/tabctrl.hxx1
-rw-r--r--include/vcl/toolkit/field.hxx1
-rw-r--r--include/vcl/toolkit/spinfld.hxx1
-rw-r--r--include/vcl/treelistbox.hxx2
-rw-r--r--include/vcl/uitest/uiobject.hxx1
-rw-r--r--include/vcl/uitest/uitest.hxx2
-rw-r--r--include/vcl/vclevent.hxx2
-rw-r--r--include/vcl/viewdataentry.hxx2
-rw-r--r--include/vcl/weld.hxx1
-rw-r--r--include/vcl/weldutils.hxx2
-rw-r--r--include/vcl/windowstate.hxx1
-rw-r--r--include/vcl/wizardmachine.hxx1
-rw-r--r--include/xmloff/XMLPageExport.hxx1
-rw-r--r--include/xmloff/xmlmetae.hxx1
97 files changed, 44 insertions, 140 deletions
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index ff20b0691aef..ce376cba10a4 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -236,6 +236,9 @@ excludelist:
include/tools/svlibrary.h:
# Used behind #ifndef
- osl/module.h
+ include/tools/simdsupport.hxx:
+ # Needed for CPU intrinsics detection to work
+ - emmintrin.h
include/unotools/accessiblestatesethelper.hxx:
# base class has to be a complete type
- com/sun/star/accessibility/XAccessibleStateSet.hpp
@@ -906,6 +909,8 @@ excludelist:
- com/sun/star/drawing/CameraGeometry.hpp
- com/sun/star/text/WritingMode.hpp
- com/sun/star/graphic/XGraphic.hpp
+ - com/sun/star/drawing/QRCode.hpp
+ - svx/svddef.hxx
include/svx/xdef.hxx:
# Needed for macro defines
- svl/typedwhich.hxx
diff --git a/include/sfx2/AccessibilityCheck.hxx b/include/sfx2/AccessibilityCheck.hxx
index 6de1069e58a1..185bc050d771 100644
--- a/include/sfx2/AccessibilityCheck.hxx
+++ b/include/sfx2/AccessibilityCheck.hxx
@@ -12,9 +12,6 @@
#define INCLUDED_SFX2_ACCESSIBILITYCHECKDIALOG_HXX
#include <sfx2/dllapi.h>
-#include <vector>
-#include <memory>
-#include <rtl/ustring.hxx>
#include <sfx2/AccessibilityIssue.hxx>
namespace sfx
diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx
index e9bb6244be69..a82665563516 100644
--- a/include/sfx2/charmappopup.hxx
+++ b/include/sfx2/charmappopup.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SFX2_INC_CHARMAPPOPUP_HXX
#include <svtools/popupwindowcontroller.hxx>
-#include <sfx2/dllapi.h>
class CharmapPopup final : public svt::PopupWindowController
{
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 5f1efdfe7b3c..521434236cea 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -30,6 +30,7 @@
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
+#include <svtools/ctrlbox.hxx>
#include <vcl/idle.hxx>
diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx
index 04f6fe720247..aecdcbab5b81 100644
--- a/include/sfx2/emojipopup.hxx
+++ b/include/sfx2/emojipopup.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SFX2_INC_EMOJIPOPUP_HXX
#include <svtools/popupwindowcontroller.hxx>
-#include <sfx2/dllapi.h>
class EmojiPopup final : public svt::PopupWindowController
{
diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx
index c489390ec384..25f470a2d24f 100644
--- a/include/sfx2/frmhtml.hxx
+++ b/include/sfx2/frmhtml.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
-#include <sfx2/sfxhtml.hxx>
+#include <svtools/parhtml.hxx>
class SfxFrameDescriptor;
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 055167890ee4..1f24d98059df 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -23,7 +23,7 @@
#include <sfx2//dllapi.h>
#include <sfx2/sidebar/ResourceManager.hxx>
-
+#include <vcl/button.hxx>
#include <vcl/menu.hxx>
#include <vcl/window.hxx>
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 4785c4de7c7d..9ce86c659143 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -25,7 +25,6 @@
#include <sal/types.h>
#include <svl/poolitem.hxx>
#include <svtools/toolboxcontroller.hxx>
-#include <rtl/ref.hxx>
#include <vcl/window.hxx>
namespace com::sun::star::frame { class XDispatchProvider; }
diff --git a/include/sfx2/weldutils.hxx b/include/sfx2/weldutils.hxx
index c72a473c4cf9..799d203ff94a 100644
--- a/include/sfx2/weldutils.hxx
+++ b/include/sfx2/weldutils.hxx
@@ -17,7 +17,6 @@
#include <tools/link.hxx>
#include <sfx2/dllapi.h>
#include <svtools/miscopt.hxx>
-#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <map>
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 550c88d57647..447e6d710949 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -21,10 +21,8 @@
#include <config_options.h>
#include <svl/svldllapi.h>
-#include <svl/eitem.hxx>
+#include <svl/poolitem.hxx>
-#include <cstddef>
-#include <memory>
#include <vector>
class UNLESS_MERGELIBS(SVL_DLLPUBLIC) SfxAllEnumItem final : public SfxPoolItem
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index 3f3e4464cbed..32d4c4ddc119 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX
#define INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX
-#include <svtools/svtdllapi.h>
#include <com/sun/star/frame/XFrameActionListener.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <cppuhelper/weak.hxx>
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index 1c1e2d246148..5f2f643088f3 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -30,7 +30,6 @@
#include <comphelper/uno3.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
-#include <tools/link.hxx>
#include <vcl/weld.hxx>
namespace com :: sun :: star :: awt { class XWindow; }
diff --git a/include/svtools/sampletext.hxx b/include/svtools/sampletext.hxx
index 9c32cba7b545..3d2ed5091ce4 100644
--- a/include/svtools/sampletext.hxx
+++ b/include/svtools/sampletext.hxx
@@ -12,7 +12,6 @@
#include <svtools/svtdllapi.h>
#include <rtl/ustring.hxx>
#include <unicode/uscript.h>
-#include <i18nlangtag/lang.h>
#include <vcl/fontcapabilities.hxx>
class OutputDevice;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 6c6055d0d982..410003e97d72 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVTOOLS_VALUESET_HXX
#define INCLUDED_SVTOOLS_VALUESET_HXX
-#include <config_options.h>
#include <svtools/svtdllapi.h>
#include <tools/wintypes.hxx>
#include <vcl/customweld.hxx>
diff --git a/include/svx/AccessibilityCheckDialog.hxx b/include/svx/AccessibilityCheckDialog.hxx
index 9c17aba2921f..5227cbee2699 100644
--- a/include/svx/AccessibilityCheckDialog.hxx
+++ b/include/svx/AccessibilityCheckDialog.hxx
@@ -11,10 +11,8 @@
#ifndef INCLUDED_SVX_ACCESSIBILITYCHECKDIALOG_HXX
#define INCLUDED_SVX_ACCESSIBILITYCHECKDIALOG_HXX
-#include <sfx2/AccessibilityCheck.hxx>
-#include <sal/types.h>
+#include <sfx2/AccessibilityIssue.hxx>
#include <svx/svxdllapi.h>
-#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <vcl/weld.hxx>
diff --git a/include/svx/DiagramDataInterface.hxx b/include/svx/DiagramDataInterface.hxx
index f64dc3a09316..7279ec882675 100644
--- a/include/svx/DiagramDataInterface.hxx
+++ b/include/svx/DiagramDataInterface.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SVX_DIAGRAMDATAINTERFACE_HXX
#define INCLUDED_SVX_DIAGRAMDATAINTERFACE_HXX
-#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <utility>
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index c505eb412d44..96417c7d3257 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_PALETTE_HXX
#include <rtl/ustring.hxx>
-#include <svx/svxdllapi.h>
class Color;
class SvxColorValueSet;
diff --git a/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx
index a595b9570ddb..b76b3adfcb2e 100644
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ b/include/svx/ParaLineSpacingPopup.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
#include <svtools/popupwindowcontroller.hxx>
-#include <svx/svxdllapi.h>
namespace svx {
diff --git a/include/svx/TextCharacterSpacingPopup.hxx b/include/svx/TextCharacterSpacingPopup.hxx
index 0c7b5b04f2d8..4ed191942084 100644
--- a/include/svx/TextCharacterSpacingPopup.hxx
+++ b/include/svx/TextCharacterSpacingPopup.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
#include <svtools/popupwindowcontroller.hxx>
-#include <svx/svxdllapi.h>
namespace svx {
diff --git a/include/svx/TextUnderlinePopup.hxx b/include/svx/TextUnderlinePopup.hxx
index 1d4074f8b9f8..530b486a5c7f 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/include/svx/TextUnderlinePopup.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
#include <svtools/popupwindowcontroller.hxx>
-#include <svx/svxdllapi.h>
namespace svx {
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index dde83d149812..7bb6a3d13a37 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -30,7 +30,6 @@
#include <vcl/bitmapex.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/graph.hxx>
-#include <vcl/vclptr.hxx>
#include <memory>
namespace vcl { class Window; }
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index e587dbc3db6d..3ad1fba53683 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_CHARTHELPER_HXX
#define INCLUDED_SVX_CHARTHELPER_HXX
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <sal/types.h>
#include <svx/svxdllapi.h>
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index d4eb26650703..29c255506c89 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_DIALCONTROL_HXX
#define INCLUDED_SVX_DIALCONTROL_HXX
-#include <config_options.h>
#include <memory>
#include <vcl/customweld.hxx>
#include <vcl/virdev.hxx>
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 194383b529c7..7c40b336108b 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_FRAMELINKARRAY_HXX
#define INCLUDED_SVX_FRAMELINKARRAY_HXX
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <svx/svxdllapi.h>
#include <svx/rotmodit.hxx>
#include <memory>
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 4bb37f68fd7a..61fd62927a2d 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -22,7 +22,6 @@
#include <vcl/graph.hxx>
#include <vcl/customweld.hxx>
-#include <vcl/transfer.hxx>
#include <svtools/valueset.hxx>
#include <vcl/GraphicObject.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index c0c1bf260670..4c3748c7b145 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -26,7 +26,7 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
-#include <vcl/salctype.hxx>
+#include <vcl/bitmapex.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <svx/galmisc.hxx>
#include <memory>
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index a270d25f0e3c..32e5f5bcc06c 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -19,10 +19,10 @@
#ifndef INCLUDED_SVX_ITEMWIN_HXX
#define INCLUDED_SVX_ITEMWIN_HXX
-#include <vcl/InterimItemWindow.hxx>
#include <svtools/toolbarmenu.hxx>
-#include <svx/dlgctrl.hxx>
#include <svx/svxdllapi.h>
+#include <svx/xtable.hxx>
+#include <vcl/customweld.hxx>
class SfxObjectShell;
class ValueSet;
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
index 9b9e5fe13acf..a6caf1e18dcb 100644
--- a/include/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_LAYCTRL_HXX
#include <svtools/popupwindowcontroller.hxx>
-#include <svx/svxdllapi.h>
class SvxTableToolBoxControl final : public svt::PopupWindowController
{
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
index 0b4b72139d7e..6799078f20a8 100644
--- a/include/svx/lboxctrl.hxx
+++ b/include/svx/lboxctrl.hxx
@@ -23,7 +23,6 @@
#include <rtl/ustring.hxx>
#include <vector>
#include <svtools/popupwindowcontroller.hxx>
-#include <svx/svxdllapi.h>
class ToolBox;
class SvxPopupWindowListBox;
diff --git a/include/svx/legacyitem.hxx b/include/svx/legacyitem.hxx
index 4a966122010c..b8d1362b4464 100644
--- a/include/svx/legacyitem.hxx
+++ b/include/svx/legacyitem.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SVX_LEGACYITEM_HXX
#define INCLUDED_SVX_LEGACYITEM_HXX
-#include <svx/svxdllapi.h>
+#include <sal/types.h>
//////////////////////////////////////////////////////////////////////////////
// // svx
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index e04872ff975a..9d1fbc8daf47 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_SDGMOITM_HXX
#define INCLUDED_SVX_SDGMOITM_HXX
-#include <vcl/GraphicObject.hxx>
+#include <vcl/GraphicAttributes.hxx>
#include <svl/eitem.hxx>
#include <svx/svddef.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx
index 3284a68386c6..078cc6342801 100644
--- a/include/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
#include <svx/sdr/animation/scheduler.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
namespace sdr::contact { class ViewObjectContact; }
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index 6b72b7d0efec..c8c22af9b71c 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -22,7 +22,7 @@
#include <svx/svxdllapi.h>
#include <drawinglayer/attribute/fillgradientattribute.hxx>
#include <drawinglayer/attribute/sdrfillattribute.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <svl/itemset.hxx>
#include <memory>
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index c3e9328d954f..de3ceb316332 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
#include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
class SdrLayerIDSet;
class SdrPage;
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index 9c806aa08e46..a12cb0b2915e 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -22,7 +22,7 @@
#include <memory>
#include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
namespace vcl { class Region; }
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index 1dc69d2383d1..a07217ca64be 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
#include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
namespace sdr::contact {
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index f8cf8be0b7ff..d4ef56646171 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -25,7 +25,7 @@
#include <tools/color.hxx>
#include <svx/sdr/animation/scheduler.hxx>
#include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <vector>
diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index 5562fa381014..fd5a87ac6404 100644
--- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
namespace sdr::overlay
diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx
index ded8adf06ca5..c9e12c322a5d 100644
--- a/include/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
@@ -22,7 +22,6 @@
#include <svx/svxdllapi.h>
#include <cppuhelper/weak.hxx>
-#include <memory>
class KeyEvent;
class MouseEvent;
diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx
index 455acddeed32..bdef4e11e7b8 100644
--- a/include/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX
#define INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX
-#include <config_options.h>
#include <svx/svxdllapi.h>
#include <svx/shapeproperty.hxx>
#include <rtl/ustring.hxx>
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 2ea0356dbb27..a3103b6c04c2 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -22,10 +22,8 @@
#include <memory>
#include <svx/sidebar/AreaTransparencyGradientPopup.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
-#include <sfx2/sidebar/SidebarToolBox.hxx>
#include <svx/colorbox.hxx>
#include <svx/xgrad.hxx>
-#include <svx/itemwin.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflclit.hxx>
#include <svx/xflgrit.hxx>
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 1d73c7653edd..359b822e16b1 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -22,9 +22,7 @@
#include <vcl/weld.hxx>
#include <memory>
#include <svl/poolitem.hxx>
-#include <svx/dlgctrl.hxx>
#include <sfx2/sidebar/PanelLayout.hxx>
-#include <svx/xtable.hxx>
#include <svx/sidebar/LineWidthPopup.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/signaturelinehelper.hxx b/include/svx/signaturelinehelper.hxx
index 70ddbfbf7905..b4a34749d101 100644
--- a/include/svx/signaturelinehelper.hxx
+++ b/include/svx/signaturelinehelper.hxx
@@ -13,7 +13,6 @@
#include <rtl/ustring.hxx>
#include <svx/svxdllapi.h>
-#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/security/XCertificate.hpp>
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index f58fd0fe3d9d..ef2be491ce6c 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -23,14 +23,12 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/drawing/QRCode.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
#include <vcl/graph.hxx>
#include <svx/svdorect.hxx>
#include <vcl/GraphicObject.hxx>
#include <svx/svxdllapi.h>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
-#include <cstddef>
namespace sdr
{
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 6f1804bb1757..41e9baa3faa9 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -30,7 +30,7 @@
#include <svl/style.hxx>
#include <svx/svdtext.hxx>
#include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <memory>
#include <vector>
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 3614ae4fe309..c020ccd52a8d 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -132,7 +132,6 @@
#include <config_options.h>
#include <svl/style.hxx>
-#include <sfx2/tbxctrl.hxx>
#include <svx/svxdllapi.h>
#include <com/sun/star/frame/XSubToolbarController.hpp>
#include <svtools/popupwindowcontroller.hxx>
diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx
index 6dc437ec383a..324e650a64f7 100644
--- a/include/svx/verttexttbxctrl.hxx
+++ b/include/svx/verttexttbxctrl.hxx
@@ -24,8 +24,6 @@
#include <cppuhelper/implbase.hxx>
#include <svtools/toolboxcontroller.hxx>
-#include <svx/svxdllapi.h>
-
//HACK to avoid duplicate ImplInheritanceHelper symbols with MSVC:
class SAL_DLLPUBLIC_TEMPLATE SvxVertCTLTextTbxCtrl_Base:
public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo>
diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx
index a7ec8c67cc27..0b31df19acb7 100644
--- a/include/svx/xpool.hxx
+++ b/include/svx/xpool.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_XPOOL_HXX
#include <svl/itempool.hxx>
-#include <svx/svxdllapi.h>
#include <memory>
/*************************************************************************
diff --git a/include/test/xmldocptr.hxx b/include/test/xmldocptr.hxx
index abca72633c61..bb41ddb9e02b 100644
--- a/include/test/xmldocptr.hxx
+++ b/include/test/xmldocptr.hxx
@@ -9,6 +9,7 @@
#pragma once
#include <memory>
+#include <libxml/tree.h>
struct xmlDocDeleter
{
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index 59d1a65edfee..6db587343f15 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -22,7 +22,6 @@
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XDevice.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index a0f609a9e8b7..ea7c3556c47a 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -23,7 +23,6 @@
#include <memory>
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XFont2.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/include/tools/UnitConversion.hxx b/include/tools/UnitConversion.hxx
index 2585fecbb590..028e5dcecfae 100644
--- a/include/tools/UnitConversion.hxx
+++ b/include/tools/UnitConversion.hxx
@@ -10,6 +10,8 @@
#pragma once
+#include <sal/types.h>
+
constexpr sal_Int64 convertTwipToMm100(sal_Int64 n)
{
return (n >= 0) ? (n * 127 + 36) / 72 : (n * 127 - 36) / 72;
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index ed1f5f0be649..7caf9c6a93f5 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -21,7 +21,6 @@
#include <sal/types.h>
#include <tools/toolsdllapi.h>
-#include <memory>
#include <ostream>
#include <type_traits>
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index e069717bbd53..4f6927c62f0b 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -25,7 +25,6 @@
#include <algorithm>
#include <ostream>
#include <config_options.h>
-#include <cassert>
class SvStream;
namespace rtl
diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index 3b27a18833f3..10e1a3a7aafc 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -10,7 +10,6 @@
#include <tools/toolsdllapi.h>
#include <rtl/ustring.hxx>
-#include <algorithm>
namespace rtl
{
diff --git a/include/tools/mapunit.hxx b/include/tools/mapunit.hxx
index 6112bc7ef461..fcaa03bcdb8c 100644
--- a/include/tools/mapunit.hxx
+++ b/include/tools/mapunit.hxx
@@ -20,9 +20,6 @@
#ifndef INCLUDED_TOOLS_MAPUNIT_HXX
#define INCLUDED_TOOLS_MAPUNIT_HXX
-#include <sal/types.h>
-#include <tools/UnitConversion.hxx>
-
enum class MapUnit
{
Map100thMM, Map10thMM, MapMM, MapCM,
diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx
index 1ee01b5a9df1..20f3b5e3db48 100644
--- a/include/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_UCBHELPER_CONTENTIDENTIFIER_HXX
#include <cppuhelper/implbase.hxx>
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/ucb/XContentIdentifier.hpp>
#include <ucbhelper/ucbhelperdllapi.h>
#include <memory>
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index 2d23d2d5fe16..680aa0cd8879 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_UCBHELPER_PROPERTYVALUESET_HXX
#define INCLUDED_UCBHELPER_PROPERTYVALUESET_HXX
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/sdbc/XColumnLocate.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/beans/Property.hpp>
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 188235d9a996..550da6c0ec13 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -24,7 +24,6 @@
#include <memory>
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 9bca51b8aa9a..243d992230d0 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_UCBHELPER_RESULTSET_HXX
#define INCLUDED_UCBHELPER_RESULTSET_HXX
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 6163a148c0db..ce5c1227ad3f 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -22,7 +22,6 @@
#include <memory>
#include <osl/mutex.hxx>
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ucb/XDynamicResultSet.hpp>
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 8f8e28c1cd1c..9c42dc1b788b 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -24,7 +24,6 @@
#include <memory>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase.hxx>
#include <ucbhelper/ucbhelperdllapi.h>
diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx
index e00b25b241e2..36f24d3a4f71 100644
--- a/include/vbahelper/vbaaccesshelper.hxx
+++ b/include/vbahelper/vbaaccesshelper.hxx
@@ -31,7 +31,6 @@
#include <osl/diagnose.h>
//#define VBAHELPER_DLLIMPLEMENTATION
#include <rtl/ustring.hxx>
-#include <sal/types.h>
#include <sfx2/objsh.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 8c168b64262c..76598cb80812 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -13,12 +13,10 @@
#include <config_cairo_canvas.h>
#include <vcl/bitmapex.hxx>
#include <vcl/ImageTree.hxx>
-#include <vcl/BitmapColor.hxx>
#if ENABLE_CAIRO_CANVAS
#include <vcl/cairo.hxx>
#endif
#include <basegfx/range/b2drectangle.hxx>
-#include <o3tl/safeint.hxx>
#include <array>
#include <vcl/RawBitmap.hxx>
diff --git a/include/vcl/GraphicAttributes.hxx b/include/vcl/GraphicAttributes.hxx
index 0908a8f56b9d..08b716b3db08 100644
--- a/include/vcl/GraphicAttributes.hxx
+++ b/include/vcl/GraphicAttributes.hxx
@@ -19,9 +19,7 @@
#pragma once
-#include <memory>
#include <vcl/dllapi.h>
-#include <o3tl/typed_flags_set.hxx>
#include <vcl/bitmap.hxx>
enum class GraphicDrawMode
diff --git a/include/vcl/NotebookBarAddonsMerger.hxx b/include/vcl/NotebookBarAddonsMerger.hxx
index 325a6d387029..c1fea5391683 100644
--- a/include/vcl/NotebookBarAddonsMerger.hxx
+++ b/include/vcl/NotebookBarAddonsMerger.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/uno/Sequence.h>
#include <vector>
-#include <map>
class Menu;
diff --git a/include/vcl/QueueInfo.hxx b/include/vcl/QueueInfo.hxx
index 5817f5c06ee7..a011e125e27c 100644
--- a/include/vcl/QueueInfo.hxx
+++ b/include/vcl/QueueInfo.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_VCL_QUEUEINFO_HXX
#define INCLUDED_VCL_QUEUEINFO_HXX
-#include <config_options.h>
-
#include <rtl/ustring.hxx>
#include <vcl/dllapi.h>
diff --git a/include/vcl/RawBitmap.hxx b/include/vcl/RawBitmap.hxx
index aeb5dec9f3e1..92e903b4292d 100644
--- a/include/vcl/RawBitmap.hxx
+++ b/include/vcl/RawBitmap.hxx
@@ -9,6 +9,10 @@
#pragma once
+#include <o3tl/safeint.hxx>
+#include <vcl/BitmapColor.hxx>
+#include <vcl/bitmapex.hxx>
+
namespace vcl::bitmap
{
/**
diff --git a/include/vcl/animate/AnimationBitmap.hxx b/include/vcl/animate/AnimationBitmap.hxx
index 5b438f8c4d6a..6f5aa1768629 100644
--- a/include/vcl/animate/AnimationBitmap.hxx
+++ b/include/vcl/animate/AnimationBitmap.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX
#define INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX
-#include <vcl/dllapi.h>
#include <vcl/bitmapex.hxx>
enum class Disposal
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 820a8efe057a..9f0f7b9cf74f 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_DOCKWIN_HXX
#define INCLUDED_VCL_DOCKWIN_HXX
-#include <config_options.h>
#include <vcl/dllapi.h>
#include <o3tl/deleter.hxx>
#include <vcl/builder.hxx>
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 7edc7686e1fb..0ad6203a10e9 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -27,7 +27,6 @@
#include <rtl/ustrbuf.hxx>
#include <o3tl/deleter.hxx>
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/menu.hxx>
#include <vcl/dndhelp.hxx>
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
deleted file mode 100644
index b7cf238eb0c9..000000000000
--- a/include/vcl/field.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_VCL_FIELD_HXX
-#define INCLUDED_VCL_FIELD_HXX
-
-#include <config_options.h>
-#include <memory>
-#include <vcl/dllapi.h>
-#endif // INCLUDED_VCL_FIELD_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/formatter.hxx b/include/vcl/formatter.hxx
index fce7f5018aee..99d45fb40ea3 100644
--- a/include/vcl/formatter.hxx
+++ b/include/vcl/formatter.hxx
@@ -20,6 +20,8 @@
#pragma once
#include <config_options.h>
+#include <i18nlangtag/lang.h>
+#include <tools/link.hxx>
#include <vcl/settings.hxx>
#include <map>
#include <memory>
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 0e116234fcb5..72352f6902a1 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_GFXLINK_HXX
#define INCLUDED_VCL_GFXLINK_HXX
-#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
#include <vcl/dllapi.h>
#include <vcl/mapmod.hxx>
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index f01c1747280d..a77eb89e9f76 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -23,7 +23,6 @@
#include <vcl/dllapi.h>
#include <tools/gen.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/vclenum.hxx>
#include <vcl/outdev.hxx>
#include <memory>
diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx
index 2310328904e9..902b5f908cdf 100644
--- a/include/vcl/imapobj.hxx
+++ b/include/vcl/imapobj.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_IMAPOBJ_HXX
#define INCLUDED_VCL_IMAPOBJ_HXX
-#include <vcl/dllapi.h>
#include <svl/macitem.hxx>
#include <rtl/strbuf.hxx>
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index facf8854263b..3fcfd58c3f43 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -22,12 +22,7 @@
#include <vcl/vclptr.hxx>
#include <vcl/IContext.hxx>
#include <vcl/commandevent.hxx>
-#include <tools/stream.hxx>
-#include <vcl/cvtgrf.hxx>
-#include <comphelper/base64.hxx>
-#include <vcl/virdev.hxx>
#include <set>
-#include <boost/property_tree/json_parser.hpp>
class ScrollBar;
class ScrollBar;
diff --git a/include/vcl/naturalsort.hxx b/include/vcl/naturalsort.hxx
index 852c8472b68f..1883bb35701c 100644
--- a/include/vcl/naturalsort.hxx
+++ b/include/vcl/naturalsort.hxx
@@ -10,6 +10,7 @@
#pragma once
#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
namespace vcl
{
diff --git a/include/vcl/scopedbitmapaccess.hxx b/include/vcl/scopedbitmapaccess.hxx
index f63bcc55f8a3..b06618091529 100644
--- a/include/vcl/scopedbitmapaccess.hxx
+++ b/include/vcl/scopedbitmapaccess.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_VCL_SCOPEDBITMAPACCESS_HXX
#define INCLUDED_VCL_SCOPEDBITMAPACCESS_HXX
+#include <sal/types.h>
+
namespace vcl
{
diff --git a/include/vcl/specialchars.hxx b/include/vcl/specialchars.hxx
index d310a92a6e0d..5a7fe8cd3f85 100644
--- a/include/vcl/specialchars.hxx
+++ b/include/vcl/specialchars.hxx
@@ -20,6 +20,9 @@
#ifndef INCLUDED_VCL_SPECIAL_CHARS_HXX
#define INCLUDED_VCL_SPECIAL_CHARS_HXX
+#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
+
namespace vcl
{
class Font;
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 422f8e23fb50..7102633f7a96 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -32,7 +32,6 @@
#include <osl/thread.h>
#include <tools/gen.hxx>
#include <tools/link.hxx>
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/inputtypes.hxx>
#include <vcl/exceptiontypes.hxx>
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 1be73fef8856..c4fae1adb8bc 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -22,10 +22,6 @@
#include <sal/types.h>
-#include <vector>
-
-#include <config_cairo_canvas.h>
-
#ifdef MACOSX
// predeclare the native classes to avoid header/include problems
typedef struct CGContext *CGContextRef;
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 32f07c111187..f694c4d64c8e 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -26,7 +26,6 @@
#include <vcl/vclenum.hxx>
#include <vcl/window.hxx>
#include <vcl/windowstate.hxx>
-#include <o3tl/typed_flags_set.hxx>
#include <memory>
#include <vcl/NotebookBarAddonsMerger.hxx>
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 798b5ac370dd..4fe386da3d15 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -26,7 +26,6 @@
#include <vcl/toolbox.hxx>
#include <vcl/EnumContext.hxx>
#include <vcl/NotebookbarContextControl.hxx>
-#include <boost/property_tree/json_parser.hpp>
class ImplTabItem;
struct ImplTabCtrlData;
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index 705e734c20d9..714ff87de2c9 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -27,7 +27,6 @@
#include <tools/date.hxx>
#include <tools/fldunit.hxx>
#include <tools/time.hxx>
-#include <tools/link.hxx>
#include <vcl/toolkit/combobox.hxx>
#include <vcl/toolkit/spinfld.hxx>
diff --git a/include/vcl/toolkit/spinfld.hxx b/include/vcl/toolkit/spinfld.hxx
index 7afe3e210af0..5eca1f13fbbe 100644
--- a/include/vcl/toolkit/spinfld.hxx
+++ b/include/vcl/toolkit/spinfld.hxx
@@ -26,7 +26,6 @@
#include <vcl/dllapi.h>
#include <vcl/edit.hxx>
#include <vcl/timer.hxx>
-#include <config_options.h>
class VCL_DLLPUBLIC SpinField : public Edit
{
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index ce45fab4a9ee..b7b5a4daa11d 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -27,7 +27,6 @@
#include <vector>
#include <vcl/ctrl.hxx>
-#include <vcl/accel.hxx>
#include <vcl/mnemonicengine.hxx>
#include <vcl/quickselectionengine.hxx>
#include <vcl/image.hxx>
@@ -35,7 +34,6 @@
#include <tools/contnr.hxx>
#include <vcl/treelist.hxx>
#include <vcl/transfer.hxx>
-#include <vcl/idle.hxx>
#include <vcl/menu.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index 36dd5488ce7a..1797c9156aba 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -16,6 +16,7 @@
#include <vcl/window.hxx>
#include <vcl/dllapi.h>
+#include <vcl/treelistbox.hxx>
#include <set>
diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 4b9ca92f4465..53bdded590aa 100644
--- a/include/vcl/uitest/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -12,8 +12,6 @@
#include <rtl/ustring.hxx>
-#include <vcl/dllapi.h>
-
#include <memory>
namespace com::sun::star::beans { struct PropertyValue; }
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 2daa23468bb7..ad24a61740a2 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -23,8 +23,6 @@
#include <vcl/dllapi.h>
#include <vcl/vclptr.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-
class Menu;
namespace com::sun::star::accessibility {
diff --git a/include/vcl/viewdataentry.hxx b/include/vcl/viewdataentry.hxx
index 6b7413f04a1f..c81ab05a97e3 100644
--- a/include/vcl/viewdataentry.hxx
+++ b/include/vcl/viewdataentry.hxx
@@ -20,9 +20,7 @@
#ifndef INCLUDED_VCL_VIEWDATAENTRY_HXX
#define INCLUDED_VCL_VIEWDATAENTRY_HXX
-#include <vcl/dllapi.h>
#include <tools/solar.h>
-#include <tools/gen.hxx>
#include <vector>
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index c45a0cc35c54..8a796040bc78 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -17,7 +17,6 @@
#include <tools/fldunit.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
-#include <tools/time.hxx>
#include <vcl/dllapi.h>
#include <vcl/vclenum.hxx>
#include <vcl/font.hxx>
diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx
index 75da11f586bd..8a57ecead9b8 100644
--- a/include/vcl/weldutils.hxx
+++ b/include/vcl/weldutils.hxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/compbase.hxx>
-#include <tools/link.hxx>
+#include <tools/time.hxx>
#include <vcl/dllapi.h>
#include <vcl/formatter.hxx>
#include <vcl/weld.hxx>
diff --git a/include/vcl/windowstate.hxx b/include/vcl/windowstate.hxx
index 3935512612cc..dcf0f4e9a394 100644
--- a/include/vcl/windowstate.hxx
+++ b/include/vcl/windowstate.hxx
@@ -22,6 +22,7 @@
#include <vcl/dllapi.h>
#include <vcl/vclenum.hxx>
+#include <rtl/string.hxx>
class VCL_PLUGIN_PUBLIC WindowStateData
{
diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index 365f875f8783..a2ce936630c2 100644
--- a/include/vcl/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -22,7 +22,6 @@
#include <memory>
#include <vcl/dllapi.h>
#include <vcl/builderpage.hxx>
-#include <vcl/idle.hxx>
namespace weld {
class Builder;
diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx
index 73a60ef1c5f0..4553c9b61217 100644
--- a/include/xmloff/XMLPageExport.hxx
+++ b/include/xmloff/XMLPageExport.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
-#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <vector>
#include <rtl/ref.hxx>
diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx
index 2dc6ec2f3dc3..220807f557b6 100644
--- a/include/xmloff/xmlmetae.hxx
+++ b/include/xmloff/xmlmetae.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_XMLOFF_XMLMETAE_HXX
#include <sal/config.h>
-#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <cppuhelper/implbase.hxx>