[Libreoffice-commits] core.git: accessibility/source avmedia/source basctl/source basic/source canvas/source chart2/source cui/source dbaccess/source desktop/qa desktop/source drawinglayer/source editeng/source emfio/source extensions/source filter/source forms/source framework/source include/sfx2 include/vcl oox/source reportdesign/source scripting/source sc/source sd/source sfx2/source starmath/source svtools/source svx/source sw/inc sw/qa sw/source toolkit/source unotools/source vbahelper/source vcl/headless vcl/inc vcl/osx vcl/source vcl/unx vcl/win winaccessibility/source writerfilter/source writerperfect/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 10 13:20:22 UTC 2018
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 1
accessibility/source/extended/accessiblelistboxentry.cxx | 1
accessibility/source/extended/accessibletabbar.cxx | 1
accessibility/source/extended/accessibletabbarpage.cxx | 1
accessibility/source/extended/accessibletabbarpagelist.cxx | 1
accessibility/source/standard/accessiblemenucomponent.cxx | 1
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 1
accessibility/source/standard/vclxaccessibleheaderbaritem.cxx | 1
accessibility/source/standard/vclxaccessiblelistitem.cxx | 1
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 1
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 1
accessibility/source/standard/vclxaccessibletabpage.cxx | 1
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 1
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 1
avmedia/source/framework/MediaControlBase.cxx | 1
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 1
basctl/source/accessibility/accessibledialogwindow.cxx | 1
basctl/source/basicide/scriptdocument.cxx | 1
basic/source/uno/dlgcont.cxx | 1
canvas/source/cairo/cairo_devicehelper.cxx | 1
chart2/source/controller/accessibility/AccessibleBase.cxx | 1
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 1
chart2/source/view/charttypes/VSeriesPlotter.cxx | 1
cui/source/dialogs/SignSignatureLineDialog.cxx | 1
cui/source/dialogs/about.cxx | 1
cui/source/dialogs/cuigaldlg.cxx | 1
cui/source/dialogs/hangulhanjadlg.cxx | 1
cui/source/dialogs/hyphen.cxx | 1
cui/source/dialogs/thesdlg.cxx | 1
cui/source/options/optgenrl.cxx | 1
cui/source/tabpages/numpages.cxx | 1
dbaccess/source/core/dataaccess/ModelImpl.cxx | 1
dbaccess/source/ui/browser/unodatbr.cxx | 1
dbaccess/source/ui/control/ColumnControlWindow.cxx | 1
dbaccess/source/ui/dlg/tablespage.cxx | 1
dbaccess/source/ui/inc/TableDesignView.hxx | 1
dbaccess/source/ui/misc/TokenWriter.cxx | 1
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 1
desktop/qa/desktop_lib/test_desktop_lib.cxx | 1
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 1
desktop/source/splash/splash.cxx | 1
drawinglayer/source/processor2d/getdigitlanguage.cxx | 1
drawinglayer/source/tools/emfphelperdata.cxx | 1
drawinglayer/source/tools/wmfemfhelper.cxx | 1
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 1
editeng/source/accessibility/AccessibleImageBullet.cxx | 1
editeng/source/items/numitem.cxx | 1
editeng/source/items/paraitem.cxx | 1
editeng/source/items/textitem.cxx | 1
editeng/source/misc/splwrap.cxx | 1
editeng/source/rtf/svxrtf.cxx | 1
editeng/source/uno/UnoForbiddenCharsTable.cxx | 1
emfio/source/reader/mtftools.cxx | 1
extensions/source/propctrlr/fontdialog.cxx | 1
filter/source/flash/swfwriter1.cxx | 1
filter/source/graphicfilter/eps/eps.cxx | 1
filter/source/graphicfilter/ipsd/ipsd.cxx | 1
filter/source/msfilter/util.cxx | 1
filter/source/svg/svgfontexport.cxx | 1
filter/source/svg/svgwriter.cxx | 1
forms/source/component/FormattedField.cxx | 1
forms/source/component/FormattedFieldWrapper.cxx | 1
forms/source/richtext/richtextimplcontrol.cxx | 1
framework/source/accelerators/acceleratorconfiguration.cxx | 1
framework/source/services/desktop.cxx | 1
framework/source/uielement/menubarmerger.cxx | 1
include/sfx2/viewsh.hxx | 1
include/vcl/salbtype.hxx | 9 -----
include/vcl/salgtype.hxx | 1
include/vcl/salnativewidgets.hxx | 1
include/vcl/scheduler.hxx | 4 --
include/vcl/scrbar.hxx | 3 -
include/vcl/seleng.hxx | 1
include/vcl/settings.hxx | 16 ++++------
include/vcl/sound.hxx | 2 -
include/vcl/spin.hxx | 1
include/vcl/spinfld.hxx | 1
include/vcl/splitwin.hxx | 1
include/vcl/svapp.hxx | 14 ++------
include/vcl/svimpbox.hxx | 8 ++---
include/vcl/svtabbx.hxx | 1
include/vcl/svtaccessiblefactory.hxx | 3 +
include/vcl/sysdata.hxx | 1
include/vcl/syswin.hxx | 1
oox/source/export/drawingml.cxx | 1
reportdesign/source/core/sdr/formatnormalizer.cxx | 1
reportdesign/source/ui/dlg/DateTime.cxx | 1
reportdesign/source/ui/inspection/GeometryHandler.cxx | 1
reportdesign/source/ui/report/ReportController.cxx | 1
reportdesign/source/ui/report/ReportWindow.cxx | 1
reportdesign/source/ui/report/StartMarker.cxx | 1
sc/source/core/data/documen3.cxx | 1
sc/source/core/tool/optutil.cxx | 2 -
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 1
sc/source/ui/dbgui/textimportoptions.cxx | 1
sc/source/ui/miscdlgs/anyrefdg.cxx | 1
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 1
sc/source/ui/view/hintwin.cxx | 1
scripting/source/dlgprov/dlgprov.cxx | 1
sd/source/core/drawdoc4.cxx | 1
sd/source/filter/eppt/pptx-text.cxx | 1
sd/source/ui/annotations/annotationmanager.cxx | 1
sd/source/ui/app/optsitem.cxx | 2 +
sd/source/ui/slideshow/showwin.cxx | 1
sfx2/source/dialog/backingwindow.cxx | 1
sfx2/source/dialog/dialoghelper.cxx | 1
sfx2/source/doc/Metadatable.cxx | 1
sfx2/source/doc/doctemplates.cxx | 1
sfx2/source/view/classificationhelper.cxx | 1
starmath/source/cfgitem.cxx | 1
svtools/source/brwbox/brwbox3.cxx | 1
svtools/source/brwbox/editbrowsebox2.cxx | 1
svtools/source/config/apearcfg.cxx | 2 +
svtools/source/contnr/DocumentInfoPreview.cxx | 1
svtools/source/contnr/fileview.cxx | 1
svtools/source/contnr/ivctrl.cxx | 1
svtools/source/control/ctrlbox.cxx | 1
svtools/source/control/ctrltool.cxx | 1
svtools/source/control/tabbar.cxx | 1
svtools/source/edit/textwindowpeer.cxx | 1
svtools/source/filter/SvFilterOptionsDialog.cxx | 1
svtools/source/misc/langhelp.cxx | 1
svtools/source/table/tablecontrol_impl.hxx | 1
svx/source/accessibility/lookupcolorname.cxx | 1
svx/source/core/graphichelper.cxx | 2 +
svx/source/dialog/compressgraphicdialog.cxx | 1
svx/source/dialog/dialcontrol.cxx | 2 +
svx/source/dialog/swframeexample.cxx | 1
svx/source/form/formcontrolfactory.cxx | 1
svx/source/sidebar/PanelLayout.cxx | 1
svx/source/sidebar/line/LineWidthPopup.cxx | 1
svx/source/sidebar/nbdtmg.cxx | 1
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 1
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 1
svx/source/svdraw/svdattr.cxx | 1
svx/source/tbxctrls/bulletsnumbering.cxx | 1
svx/source/unodraw/unoprov.cxx | 1
svx/source/xoutdev/xattr.cxx | 1
sw/inc/unosett.hxx | 1
sw/qa/extras/rtfexport/rtfexport2.cxx | 1
sw/qa/extras/uiwriter/uiwriter.cxx | 1
sw/source/core/access/acccontext.cxx | 1
sw/source/core/crsr/findattr.cxx | 1
sw/source/core/doc/docdesc.cxx | 1
sw/source/core/doc/number.cxx | 1
sw/source/core/edit/edtox.cxx | 1
sw/source/core/fields/authfld.cxx | 1
sw/source/core/layout/atrfrm.cxx | 1
sw/source/core/unocore/unoidx.cxx | 1
sw/source/core/unocore/unoobj.cxx | 1
sw/source/core/unocore/unosrch.cxx | 1
sw/source/filter/html/parcss1.cxx | 1
sw/source/uibase/docvw/AnnotationWin.cxx | 1
sw/source/uibase/docvw/HeaderFooterWin.cxx | 1
sw/source/uibase/sidebar/PageSizeControl.cxx | 1
sw/source/uibase/uiview/view2.cxx | 1
sw/source/uibase/utlui/attrdesc.cxx | 1
toolkit/source/awt/vclxaccessiblecomponent.cxx | 1
toolkit/source/awt/vclxtoolkit.cxx | 2 -
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 1
unotools/source/misc/datetime.cxx | 1
vbahelper/source/vbahelper/vbahelper.cxx | 1
vcl/headless/svpbmp.cxx | 1
vcl/headless/svpgdi.cxx | 1
vcl/inc/salbmp.hxx | 1
vcl/inc/svdata.hxx | 1
vcl/osx/printaccessoryview.mm | 1
vcl/source/app/brand.cxx | 1
vcl/source/app/salvtables.cxx | 1
vcl/source/app/settings.cxx | 1
vcl/source/bitmap/BitmapColorizeFilter.cxx | 1
vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx | 1
vcl/source/bitmap/BitmapEmbossGreyFilter.cxx | 1
vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx | 1
vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx | 1
vcl/source/bitmap/BitmapScaleSuperFilter.cxx | 1
vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx | 1
vcl/source/bitmap/BitmapTools.cxx | 1
vcl/source/bitmap/bitmap.cxx | 1
vcl/source/bitmap/bitmappaint.cxx | 1
vcl/source/control/edit.cxx | 1
vcl/source/edit/vclmedit.cxx | 1
vcl/source/edit/xtextedt.cxx | 1
vcl/source/filter/jpeg/JpegWriter.cxx | 1
vcl/source/gdi/bitmap3.cxx | 1
vcl/source/gdi/bmpfast.cxx | 1
vcl/source/gdi/dibtools.cxx | 1
vcl/source/gdi/gdimtf.cxx | 1
vcl/source/gdi/impvect.cxx | 1
vcl/source/gdi/pdfwriter_impl.cxx | 1
vcl/source/gdi/pdfwriter_impl2.cxx | 1
vcl/source/gdi/pngwrite.cxx | 1
vcl/source/gdi/salmisc.cxx | 2 +
vcl/source/helper/canvastools.cxx | 1
vcl/source/helper/svtaccessiblefactory.cxx | 1
vcl/source/outdev/bitmap.cxx | 1
vcl/source/outdev/hatch.cxx | 1
vcl/source/outdev/transparent.cxx | 1
vcl/source/treelist/svimpbox.cxx | 1
vcl/source/treelist/svtabbx.cxx | 1
vcl/source/treelist/treelistbox.cxx | 1
vcl/source/window/builder.cxx | 1
vcl/source/window/dlgctrl.cxx | 1
vcl/source/window/dockwin.cxx | 1
vcl/source/window/mnemonic.cxx | 1
vcl/source/window/settings.cxx | 1
vcl/source/window/syswin.cxx | 1
vcl/source/window/tabpage.cxx | 1
vcl/unx/generic/gdi/salbmp.cxx | 1
vcl/unx/generic/printer/ppdparser.cxx | 1
vcl/unx/gtk/a11y/atktextattributes.cxx | 1
vcl/unx/gtk3/gtk3gtkinst.cxx | 1
vcl/win/gdi/salbmp.cxx | 1
winaccessibility/source/UAccCOM/AccTextBase.cxx | 1
winaccessibility/source/UAccCOM/MAccessible.cxx | 1
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 1
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 1
writerperfect/source/writer/EPUBExportDialog.cxx | 1
218 files changed, 224 insertions(+), 52 deletions(-)
New commits:
commit 00b49f9ff9777cb1c1e971feec55b2448fba8be2
Author: Gabor Kelemen <kelemeng at ubuntu.com>
AuthorDate: Mon Dec 3 18:58:38 2018 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Dec 10 14:19:50 2018 +0100
tdf#42949 Fix IWYU warnings in include/vcl/s*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ie87d27dd2c385a63349e0b322fd067ba03d2d152
Reviewed-on: https://gerrit.libreoffice.org/64479
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index c965db29ac5d..c2cb7c94224e 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -37,6 +37,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <svtools/stringtransfer.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
+#include <i18nlangtag/languagetag.hxx>
#define ACCESSIBLE_ACTION_COUNT 1
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 1a92d967e246..5fd7ecf1eaf7 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/svapp.hxx>
#include <vcl/controllayout.hxx>
#include <vcl/settings.hxx>
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index f4b111698abf..b511fd9463a5 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -27,6 +27,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <toolkit/awt/vclxfont.hxx>
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 631eb794300d..7c959e03903e 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -29,6 +29,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <toolkit/helper/convert.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace accessibility
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 02cdad44cd49..1e5228a48fc6 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -30,6 +30,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <toolkit/helper/convert.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace accessibility
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index efe3e79dc816..95ab74d2a8b8 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -34,6 +34,7 @@
#include <vcl/menu.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index ba5b930db03e..1e1499734e9b 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -38,6 +38,7 @@
#include <vcl/menu.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
index 250ea22f43dc..45be8fc5e8a5 100644
--- a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
@@ -32,6 +32,7 @@
#include <vcl/settings.hxx>
#include <toolkit/awt/vclxfont.hxx>
#include <toolkit/helper/convert.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vector>
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index a519cef8f815..b406725f519c 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -40,6 +40,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace
{
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 632203b95cad..ace8efa6f469 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <unotools/accessiblestatesethelper.hxx>
#include <comphelper/sequence.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index a81a720db4dd..d498d66919b5 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -35,6 +35,7 @@
#include <vcl/status.hxx>
#include <vcl/controllayout.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index d60575539dd2..bb56e3584d78 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -35,6 +35,7 @@
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 75aeaf1d5b65..def1a9db7146 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -32,6 +32,7 @@
#include <vcl/unohelp2.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vector>
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 56e871a08f06..6594731c56b9 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -43,6 +43,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <strings.hxx>
#include <sal/log.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx
index 7b9b7a1e5392..9cd55282226a 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -26,6 +26,7 @@
#include <svtools/miscopt.hxx>
#include <tools/time.hxx>
#include <vcl/lstbox.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <bitmaps.hlst>
#include <strings.hrc>
#include <helpids.h>
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 25f90d11090c..ffd5fde88332 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -34,6 +34,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace basctl
{
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 07a7d0704e98..234e30853ddc 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -37,6 +37,7 @@
#include <toolkit/helper/convert.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace basctl
{
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 6eac332022bc..20ff404b304e 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -48,6 +48,7 @@
#include <xmlscript/xmldlg_imexp.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/collatorwrapper.hxx>
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 06dd279dfadb..f458e65df0e3 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -46,6 +46,7 @@
#include <svtools/sfxecode.hxx>
#include <svtools/ehdl.hxx>
#include <vcl/GraphicObject.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace basic
{
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index 7f6962860d71..703595b360ec 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -24,6 +24,7 @@
#include <basegfx/utils/unopolypolygon.hxx>
#include <com/sun/star/lang/NoSupportException.hpp>
#include <tools/stream.hxx>
+#include <vcl/bitmapex.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/dibtools.hxx>
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index c21b92db6b28..2bfcacd3321a 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -54,6 +54,7 @@
#include <o3tl/functional.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <algorithm>
#include <iterator>
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 92027e68a312..f36375af474f 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -36,6 +36,7 @@
#include <sal/log.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <com/sun/star/chart2/XTitle.hpp>
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index a79fadcc974b..26b34dc2108a 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -72,6 +72,7 @@
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
+#include <unotools/localedatawrapper.hxx>
#include <comphelper/sequence.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx
index d189aabde24e..b89fe4d20cbf 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -26,6 +26,7 @@
#include <tools/stream.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/streamwrap.hxx>
+#include <unotools/syslocale.hxx>
#include <utility>
#include <vcl/graph.hxx>
#include <vcl/weld.hxx>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index a99a814d28e1..1f67ad12b6f4 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -35,6 +35,7 @@
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
#include <svtools/langhelp.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/system/SystemShellExecute.hpp>
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 42329f0e95b0..41200fc04cc8 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -36,6 +36,7 @@
#include <svx/galtheme.hxx>
#include <cuigaldlg.hxx>
#include <bitmaps.hlst>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index cf2297ab6c81..f22866b0bea3 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -26,6 +26,7 @@
#include <algorithm>
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/controllayout.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/decoview.hxx>
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 295d6f37fd28..44c9df73ddcc 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -26,6 +26,7 @@
#include <svx/dlgutil.hxx>
#include <vcl/builderfactory.hxx>
#include <sal/log.hxx>
+#include <i18nlangtag/languagetag.hxx>
#define HYPH_POS_CHAR '='
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index cea84d19be99..209c67d2e6ff 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -37,6 +37,7 @@
#include <svx/langbox.hxx>
#include <svtools/langtab.hxx>
#include <unotools/lingucfg.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <comphelper/string.hxx>
#include <osl/file.hxx>
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 988bdc28031a..5175e2cc7719 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -25,6 +25,7 @@
# include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#endif
+#include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <vcl/svapp.hxx>
#include <unotools/saveopt.hxx>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 10be5166cb78..5db0609b5b81 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -24,6 +24,7 @@
#include <numpages.hxx>
#include <dialmgr.hxx>
#include <tools/mapunit.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <editeng/numitem.hxx>
#include <svl/eitem.hxx>
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 4f360bfc1ee9..acdeae0d8d4d 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -55,6 +55,7 @@
#include <tools/urlobj.hxx>
#include <unotools/sharedunocomponent.hxx>
#include <unotools/configmgr.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <algorithm>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 0e421beddc24..4ce065ca1c6f 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -101,6 +101,7 @@
#include <connectivity/dbexception.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/typeprovider.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sot/storage.hxx>
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 706e5f85168f..20711d3e6b4e 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -20,6 +20,7 @@
#include <ColumnControlWindow.hxx>
#include <FieldControls.hxx>
#include <unotools/syslocale.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <connectivity/dbtools.hxx>
#include <UITools.hxx>
#include <core_resource.hxx>
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 80d12c5005cd..233157aa66f0 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -25,6 +25,7 @@
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbexception.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <stringlistitem.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index 0ede6f9d76cc..36bd42701eed 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -21,6 +21,7 @@
#include <dbaccess/dataview.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/Locale.hpp>
#include <vcl/split.hxx>
#include "IClipBoardTest.hxx"
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 351f3e54acf6..163263f2aaa5 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -23,6 +23,7 @@
#include <tools/stream.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <RtfReader.hxx>
#include <HtmlReader.hxx>
#include <stringconstants.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 748b47ff8a5c..09f393753732 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -26,6 +26,7 @@
#include <TableRow.hxx>
#include <unotools/configmgr.hxx>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <i18nlangtag/languagetag.hxx>
#include <unotools/syslocale.hxx>
#include <vcl/settings.hxx>
#include <UITools.hxx>
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 5bf343b8c825..74e2c09bb5af 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -31,6 +31,7 @@
#include <comphelper/dispatchcommand.hxx>
#include <comphelper/propertysequence.hxx>
#include <osl/conditn.hxx>
+#include <osl/thread.hxx>
#include <svl/srchitem.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <unotools/tempfile.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 677c8598c799..e7e2da90938d 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/deployment/DeploymentException.hpp>
#include <com/sun/star/deployment/ExtensionRemovedException.hpp>
#include <cppuhelper/weakref.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/commandevent.hxx>
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 336601a6d80f..195539060b81 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -23,6 +23,7 @@
#include <sal/log.hxx>
#include <unotools/bootstrap.hxx>
#include <tools/stream.hxx>
+#include <vcl/bitmapex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/salnativewidgets.hxx>
diff --git a/drawinglayer/source/processor2d/getdigitlanguage.cxx b/drawinglayer/source/processor2d/getdigitlanguage.cxx
index 7f5537466ccd..858284b23e91 100644
--- a/drawinglayer/source/processor2d/getdigitlanguage.cxx
+++ b/drawinglayer/source/processor2d/getdigitlanguage.cxx
@@ -10,6 +10,7 @@
#include <sal/config.h>
#include <i18nlangtag/lang.h>
+#include <i18nlangtag/languagetag.hxx>
#include <svl/ctloptions.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index 4714ffeb275f..5df791ec3ca4 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -44,6 +44,7 @@
#include <o3tl/make_unique.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace emfplushelper
{
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 9637b1a583fd..2fd174b9d595 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -50,6 +50,7 @@
#include <vcl/gradient.hxx>
#include <vcl/hatch.hxx>
#include <vcl/outdev.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <emfplushelper.hxx>
#include <numeric>
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index b42e895f67e0..3738cdeefc9a 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -48,6 +48,7 @@
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <vcl/unohelp.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <editeng/editeng.hxx>
#include <editeng/unoprnms.hxx>
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 38bacff7245b..89f97dde5e42 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -32,6 +32,7 @@
#include <comphelper/accessibleeventnotifier.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblestatesethelper.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/AccessibleEditableTextPara.hxx>
#include <editeng/AccessibleImageBullet.hxx>
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index e9598a33aabc..ad2b4fda65a5 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -48,6 +48,7 @@
#include <libxml/xmlwriter.h>
#include <editeng/unonrule.hxx>
#include <sal/log.hxx>
+#include <i18nlangtag/languagetag.hxx>
#define DEF_WRITER_LSPACE 500 //Standard Indentation
#define DEF_DRAW_LSPACE 800 //Standard Indentation
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index be4652018a42..4803a532609d 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -25,6 +25,7 @@
#include <comphelper/fileformat.h>
#include <comphelper/extract.hxx>
#include <osl/diagnose.h>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <tools/mapunit.hxx>
#include <svl/itempool.hxx>
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 902b26bc66aa..763d89607942 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -29,6 +29,7 @@
#include <osl/diagnose.h>
#include <unotools/fontdefs.hxx>
#include <unotools/intlwrapper.hxx>
+#include <unotools/syslocale.hxx>
#include <vcl/outdev.hxx>
#include <vcl/unohelp.hxx>
#include <editeng/eeitem.hxx>
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 33328dda8d37..7fae402aa6b8 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -18,6 +18,7 @@
*/
#include <rtl/ustring.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index c3bafbf24db8..639aee2825d5 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -24,6 +24,7 @@
#include <svl/whiter.hxx>
#include <svtools/rtftoken.h>
#include <svl/itempool.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <comphelper/string.hxx>
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index bdc938c690eb..ce277e83e32c 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/container/NoSuchElementException.hpp>
#include <editeng/UnoForbiddenCharsTable.hxx>
#include <editeng/forbiddencharacterstable.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/svapp.hxx>
#include <editeng/unolingu.hxx>
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 30b35ec82420..3c1bf8347622 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -23,6 +23,7 @@
#include <memory>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <vcl/metric.hxx>
#include <vcl/graphictools.hxx>
#include <vcl/BitmapTools.hxx>
#include <vcl/metaact.hxx>
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index f4c72b9d6b7a..703fec1b819f 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -23,6 +23,7 @@
#include "modulepcr.hxx"
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/types.hxx>
#include <comphelper/extract.hxx>
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 44d40c9453df..8acc14884e0a 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -31,6 +31,7 @@
#include <vcl/graphicfilter.hxx>
#include <vcl/graphictools.hxx>
#include <sal/log.hxx>
+#include <tools/helpers.hxx>
#include <zlib.h>
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 618d5c00c610..54fc2540f1f1 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -21,6 +21,7 @@
#include <tools/stream.hxx>
#include <tools/poly.hxx>
#include <tools/fract.hxx>
+#include <tools/helpers.hxx>
#include <unotools/resmgr.hxx>
#include <vcl/svapp.hxx>
#include <vcl/metaact.hxx>
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 44a765fe569d..1e609a85d52d 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -23,6 +23,7 @@
#include <vcl/outdev.hxx>
#include <sal/log.hxx>
#include <tools/fract.hxx>
+#include <tools/helpers.hxx>
#include <tools/stream.hxx>
#include <memory>
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 0b7b1bcc5c3c..53b5d8a810c0 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -8,6 +8,7 @@
*/
#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/lang/Locale.hpp>
#include <rtl/ustring.hxx>
#include <rtl/strbuf.hxx>
#include <unotools/fontcvt.hxx>
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 50de3e5fd89f..31f898f13f4e 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -26,6 +26,7 @@
#include <vcl/font.hxx>
#include <vcl/outdev.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
static const sal_Int32 nFontEM = 2048;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 1030c041ff1c..0b8ebfc988ff 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -30,6 +30,7 @@
#include <tools/helpers.hxx>
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
#include <sax/tools/converter.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <memory>
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 53592c52ee8f..4d66ec70ad9d 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -31,6 +31,7 @@
#include <o3tl/any.hxx>
#include <svl/zforlist.hxx>
#include <svl/numuno.hxx>
+#include <vcl/keycod.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <tools/debug.hxx>
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 6ee40bdf6d9a..f6223e4022e0 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -28,6 +28,7 @@
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
using namespace frm;
using namespace ::com::sun::star::uno;
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 5d53b8558820..50f240aeae93 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -22,6 +22,7 @@
#include "richtextengine.hxx"
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <i18nlangtag/languagetag.hxx>
#include <editeng/editeng.hxx>
#include <editeng/editview.hxx>
#include <editeng/eeitem.hxx>
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 29bbdeaceddf..37baeba37364 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -51,6 +51,7 @@
#include <unotools/configpaths.hxx>
#include <svtools/acceleratorexecute.hxx>
#include <sal/log.hxx>
+#include <rtl/ustrbuf.hxx>
#define PRESET_DEFAULT "default"
#define TARGET_CURRENT "current"
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 111a3a8f0a7e..a0d3479bf031 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -68,6 +68,7 @@
#include <desktop/crashreport.hxx>
#include <vcl/scheduler.hxx>
#include <sal/log.hxx>
+#include <rtl/ustrbuf.hxx>
#include <vcl/errinf.hxx>
#include <unotools/configmgr.hxx>
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index eb478b70283a..a28e8aa53415 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -19,6 +19,7 @@
#include <uielement/menubarmerger.hxx>
#include <framework/addonsoptions.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
using namespace ::com::sun::star;
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 67a304a14873..be6af0fe68ba 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -35,6 +35,7 @@
#include <sfx2/shell.hxx>
#include <sfx2/viewfac.hxx>
#include <tools/gen.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/IDialogRenderable.hxx>
#include <vcl/errcode.hxx>
#include <vcl/jobset.hxx>
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index ac2f283e7172..e20342f19184 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -20,17 +20,14 @@
#ifndef INCLUDED_VCL_SALBTYPE_HXX
#define INCLUDED_VCL_SALBTYPE_HXX
-#include <tools/debug.hxx>
#include <vcl/checksum.hxx>
-#include <vcl/salgtype.hxx>
-#include <tools/helpers.hxx>
#include <tools/color.hxx>
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <o3tl/typed_flags_set.hxx>
#include <vector>
#include <memory>
+struct SalTwoRect;
typedef sal_uInt8* Scanline;
typedef const sal_uInt8* ConstScanline;
@@ -85,8 +82,6 @@ d_Col = BitmapColor( static_cast<sal_uInt8>( _def_cR | ( ( _def_cR & maR.mnOr )
d_ALPHA )
-class Color;
-
class VCL_DLLPUBLIC BitmapColor final
{
private:
@@ -142,8 +137,6 @@ inline std::basic_ostream<charT, traits>& operator <<(std::basic_ostream<charT,
<< static_cast<int>(rColor.GetGreen()) << ", mcRed: " << static_cast<int>(rColor.GetRed()) << ", mcAlpha: " << static_cast<int>(rColor.GetAlpha());
}
-class Palette;
-
class VCL_DLLPUBLIC BitmapPalette
{
friend class SalBitmap;
diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx
index a373a0a62d07..3c1f59512586 100644
--- a/include/vcl/salgtype.hxx
+++ b/include/vcl/salgtype.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_SALGTYPE_HXX
#define INCLUDED_VCL_SALGTYPE_HXX
-#include <sal/types.h>
#include <o3tl/typed_flags_set.hxx>
#include <tools/color.hxx>
#include <tools/gen.hxx>
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index a9a572731e3c..0d90027e8fb6 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_SALNATIVEWIDGETS_HXX
#define INCLUDED_VCL_SALNATIVEWIDGETS_HXX
-#include <rtl/ustring.hxx>
#include <vcl/dllapi.h>
#include <tools/gen.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 0d0d58962185..96979cf5d3c5 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -22,11 +22,7 @@
#include <vcl/dllapi.h>
-class SchedulerGuard;
-class Task;
-struct TaskImpl;
struct ImplSchedulerContext;
-struct ImplSchedulerData;
class VCL_DLLPUBLIC Scheduler final
{
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 5fadfb5fbe0d..e900b26b152e 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -20,13 +20,10 @@
#ifndef INCLUDED_VCL_SCRBAR_HXX
#define INCLUDED_VCL_SCRBAR_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
#include <memory>
-class AutoTimer;
-
enum class ScrollType
{
diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx
index 0ba81da8052a..800e767c7cba 100644
--- a/include/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
@@ -26,7 +26,6 @@
#include <vcl/vclenum.hxx>
#include <o3tl/typed_flags_set.hxx>
-namespace vcl { class Window; }
class CommandEvent;
// Timerticks
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index adadeb39662f..3b7e5e215104 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -23,22 +23,21 @@
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <tools/color.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/font.hxx>
-#include <vcl/accel.hxx>
-#include <vcl/wall.hxx>
-#include <i18nlangtag/languagetag.hxx>
-#include <unotools/syslocale.hxx>
+#include <tools/gen.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
+#include <vector>
+
+class BitmapEx;
+class LanguageTag;
+class SvtSysLocale;
namespace boost
{
template<typename T> class optional;
}
-class CollatorWrapper;
class LocaleDataWrapper;
struct ImplMouseData;
struct ImplMiscData;
@@ -48,9 +47,8 @@ struct ImplAllSettingsData;
enum class ConfigurationHints;
namespace vcl {
+ class Font;
class I18nHelper;
- class IconThemeScanner;
- class IconThemeSelector;
class IconThemeInfo;
}
diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx
index 5cc9190118f8..84d3d25c4e35 100644
--- a/include/vcl/sound.hxx
+++ b/include/vcl/sound.hxx
@@ -22,8 +22,6 @@
#include <vcl/dllapi.h>
-namespace vcl { class Window; }
-
class VCL_DLLPUBLIC Sound
{
diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx
index 3d77fa5c1f06..fa37bff5f504 100644
--- a/include/vcl/spin.hxx
+++ b/include/vcl/spin.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_SPIN_HXX
#define INCLUDED_VCL_SPIN_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
#include <vcl/timer.hxx>
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 482adf40e62c..23a2b5e51c05 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_SPINFLD_HXX
#define INCLUDED_VCL_SPINFLD_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/edit.hxx>
#include <vcl/timer.hxx>
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 7f015ce96cf0..711954920c7f 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -24,7 +24,6 @@
#include <vcl/dockwin.hxx>
#include <o3tl/typed_flags_set.hxx>
-class Wallpaper;
class ImplSplitSet;
enum class SplitWindowItemFlags
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index c597ba453de3..ac1c0ddfb848 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -24,48 +24,42 @@
#include <sal/types.h>
#include <cassert>
-#include <stdexcept>
#include <vector>
#include <comphelper/solarmutex.hxx>
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
-#include <osl/thread.hxx>
+#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>
-#include <vcl/keycod.hxx>
#include <vcl/vclevent.hxx>
-#include <vcl/metric.hxx>
#include <vcl/vclenum.hxx>
-#include <unotools/localedatawrapper.hxx>
+#include <i18nlangtag/lang.h>
#include <o3tl/typed_flags_set.hxx>
#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/connection/XConnection.hpp>
class BitmapEx;
namespace weld
{
class Builder;
- class Container;
class MessageDialog;
class Widget;
class Window;
}
+class LocaleDataWrapper;
class AllSettings;
class DataChangedEvent;
class Accelerator;
class Help;
class OutputDevice;
namespace vcl { class Window; }
+namespace vcl { class KeyCode; }
class WorkWindow;
-class MenuBar;
-class UnoWrapperBase;
-class Reflection;
class NotifyEvent;
class KeyEvent;
class MouseEvent;
diff --git a/include/vcl/svimpbox.hxx b/include/vcl/svimpbox.hxx
index 88c068874165..9753629cc3c3 100644
--- a/include/vcl/svimpbox.hxx
+++ b/include/vcl/svimpbox.hxx
@@ -23,19 +23,19 @@
#include <vcl/dllapi.h>
#include <vcl/seleng.hxx>
#include <vcl/scrbar.hxx>
+#include <vcl/idle.hxx>
+#include <vcl/image.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <vcl/vclevent.hxx>
-#include <unotools/intlwrapper.hxx>
+#include <vcl/treelistbox.hxx>
#include <o3tl/enumarray.hxx>
#include <memory>
#include <vector>
-class SvTreeListBox;
-class Point;
+class SvLBoxButton;
class SvTreeList;
class SvImpLBox;
class SvTreeListEntry;
-class SvLBoxTab;
namespace comphelper
{
namespace string
diff --git a/include/vcl/svtabbx.hxx b/include/vcl/svtabbx.hxx
index 8fa72066dc1b..75aadf0db8f9 100644
--- a/include/vcl/svtabbx.hxx
+++ b/include/vcl/svtabbx.hxx
@@ -114,7 +114,6 @@ inline long SvTabListBox::GetTab( sal_uInt16 nTab ) const
class HeaderBar;
namespace vcl {
- class IAccessibleTabListBox;
struct SvHeaderTabListBoxImpl;
}
diff --git a/include/vcl/svtaccessiblefactory.hxx b/include/vcl/svtaccessiblefactory.hxx
index 24ad85f8f930..1b63e20bfb12 100644
--- a/include/vcl/svtaccessiblefactory.hxx
+++ b/include/vcl/svtaccessiblefactory.hxx
@@ -21,7 +21,8 @@
#define INCLUDED_INCLUDE_VCL_SVTACCESSIBLEFACTORY_HXX
#include <vcl/dllapi.h>
-#include <vcl/accessiblefactory.hxx>
+
+namespace vcl { class IAccessibleFactory; }
namespace vcl
{
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 794f424b4448..5c42207649d0 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -23,7 +23,6 @@
#include <sal/types.h>
#include <vector>
-#include <cstddef>
#include <config_cairo_canvas.h>
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index d8dd2f3c245c..c285abe2c024 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_SYSWIN_HXX
#define INCLUDED_VCL_SYSWIN_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/builder.hxx>
#include <vcl/idle.hxx>
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index fea129bfafa4..dc0c007433a2 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -34,6 +34,7 @@
#include <oox/drawingml/drawingmltypes.hxx>
#include <svtools/unitconv.hxx>
#include <sax/fastattribs.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <cstdio>
#include <com/sun/star/awt/CharSet.hpp>
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index b1c132bd9ed5..59e4f3619088 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -29,6 +29,7 @@
#include <connectivity/statementcomposer.hxx>
#include <connectivity/dbtools.hxx>
#include <tools/diagnose_ex.h>
+#include <i18nlangtag/languagetag.hxx>
namespace rptui
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 9b91d657d4c0..6aa4c1566073 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -21,6 +21,7 @@
#include <rptui_slotid.hrc>
#include <connectivity/dbconversion.hxx>
#include <unotools/syslocale.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <UITools.hxx>
#include <RptDef.hxx>
#include <strings.hxx>
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index a90e1bd2b7f5..a5178650f7a8 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -36,6 +36,7 @@
#include <i18nutil/searchopt.hxx>
#include <unotools/textsearch.hxx>
#include <unotools/configmgr.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/syslocale.hxx>
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 0d4f3afb38a1..4ba304f1ed18 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -128,6 +128,7 @@
#include <svtools/cliplistener.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/viewoptions.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <osl/mutex.hxx>
#include <PropertyForward.hxx>
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index b51e5164054f..78ce60cb7dbb 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -26,6 +26,7 @@
#include <svtools/colorcfg.hxx>
#include <svl/itempool.hxx>
#include <unotools/syslocale.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <vcl/settings.hxx>
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 0a6476cfd34e..9ed8e3b041b0 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -30,6 +30,7 @@
#include <vcl/settings.hxx>
#include <unotools/syslocale.hxx>
+#include <unotools/localedatawrapper.hxx>
#define CORNER_SPACE 5
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 615f79d85f9f..633ca5835113 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -27,6 +27,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
#include <vcl/svapp.hxx>
+#include <osl/thread.hxx>
#include <document.hxx>
#include <attrib.hxx>
#include <table.hxx>
diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index 9edad85bf779..1b2ed90d0e0c 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -18,11 +18,11 @@
*/
#include <vcl/svapp.hxx>
-
#include <optutil.hxx>
#include <global.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/syslocale.hxx>
+#include <unotools/localedatawrapper.hxx>
bool ScOptionsUtil::IsMetricSystem()
{
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index ad0ebba97ad8..3577a57f839d 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <tools/gen.hxx>
+#include <tools/color.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <toolkit/helper/convert.hxx>
#include <svl/hint.hxx>
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index 8d81f967f972..b0cc1a375a43 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -23,6 +23,7 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
ScTextImportOptionsDlg::ScTextImportOptionsDlg(vcl::Window* pParent)
: ModalDialog(pParent, "TextImportOptionsDialog", "modules/scalc/ui/textimportoptions.ui")
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 54a0be8869b8..64b00df333ad 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -21,6 +21,7 @@
#include <comphelper/string.hxx>
#include <sfx2/app.hxx>
#include <sfx2/viewsh.hxx>
+#include <vcl/accel.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/mnemonic.hxx>
#include <sfx2/bindings.hxx>
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 6955fa47d2b5..e622626f69f9 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -29,6 +29,7 @@
#include <svx/dlgutil.hxx>
#include <vcl/toolbox.hxx>
#include <svx/sidebar/SidebarDialControl.hxx>
+#include <unotools/localedatawrapper.hxx>
using namespace css;
using namespace css::uno;
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index 1d53dbdacc7e..a7fb47a2a339 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -36,6 +36,7 @@
#include <tools/lineend.hxx>
#include <svtools/colorcfg.hxx>
#include <vcl/settings.hxx>
+#include <vcl/metric.hxx>
#define HINT_LINESPACE 2
#define HINT_INDENT 3
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 4ae3b6b66280..751e8a178e10 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -51,6 +51,7 @@
#include <comphelper/namedvaluecollection.hxx>
#include <util/MiscUtils.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star;
using namespace awt;
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 83297fce1310..412a05e74ca1 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
+#include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 4c43f1cf181f..8d2f6c24c04d 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -50,6 +50,7 @@
#include <svl/languageoptions.hxx>
#include <oox/export/drawingml.hxx>
#include <osl/diagnose.h>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/settings.hxx>
#include <vcl/metric.hxx>
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index fb76dca613b5..dc85ab59c397 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -38,6 +38,7 @@
#include <svl/style.hxx>
#include <svl/itempool.hxx>
#include <unotools/datetime.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/useroptions.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/saveopt.hxx>
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index a087ae3a8975..300c513fb570 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -24,7 +24,9 @@
#include <svx/svxids.hrc>
#include <sfx2/app.hxx>
#include <tools/helpers.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <sdmod.hxx>
#include <optsitem.hxx>
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index daee8a5d75bf..e7c72e29af2e 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -21,6 +21,7 @@
#include "showwindow.hxx"
+#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 18cfba805837..c67ce9d6a7bd 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -21,6 +21,7 @@
#include <sfx2/inputdlg.hxx>
#include <sal/log.hxx>
+#include <vcl/accel.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx
index a0d9fa36ccd9..524fba9b563f 100644
--- a/sfx2/source/dialog/dialoghelper.cxx
+++ b/sfx2/source/dialog/dialoghelper.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <unotools/localedatawrapper.hxx>
#include <sfx2/dialoghelper.hxx>
#include <tools/datetime.hxx>
#include <vcl/builder.hxx>
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index d25b16cf7261..4b1713ba76d2 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <sal/log.hxx>
+#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
#include <sfx2/Metadatable.hxx>
#include <sfx2/XmlIdRegistry.hxx>
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index c1ebaa505d8a..bd17b7b9e78a 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -76,6 +76,7 @@
#include <svtools/templatefoldercache.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/ucbhelper.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <sfx2/sfxresid.hxx>
#include <sfxurlrelocator.hxx>
diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx
index 0caabb682b67..3b6fd0612b47 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <sal/log.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <sfx2/infobar.hxx>
#include <sfx2/objsh.hxx>
#include <o3tl/make_unique.hxx>
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 025deb9c0049..b53beef83bd0 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -31,6 +31,7 @@
#include <vcl/settings.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <i18nlangtag/languagetag.hxx>
#include <officecfg/Office/Math.hxx>
#include "cfgitem.hxx"
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 587ceb42d6ba..822eef3e1c30 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -19,6 +19,7 @@
#include <svtools/brwbox.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
+#include <vcl/accessiblefactory.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <tools/multisel.hxx>
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index ece11a380add..5b12a94c634a 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -24,6 +24,7 @@
#include <comphelper/types.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svtaccessiblefactory.hxx>
+#include <vcl/accessiblefactory.hxx>
#include <osl/diagnose.h>
namespace svt
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 4bfe5595012c..c5420dcd86bc 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -26,6 +26,8 @@
#include <vcl/svapp.hxx>
#include <sal/macros.h>
+#include <com/sun/star/uno/Sequence.hxx>
+
#define DEFAULT_DRAGMODE DragMode::SystemDep
#define DEFAULT_SNAPMODE SnapType::ToButton
#if defined UNX
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index f4e7c89b0671..17bdde5e1caf 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -39,6 +39,7 @@
#include <tools/datetime.hxx>
#include <tools/urlobj.hxx>
#include <unotools/ucbhelper.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <templwin.hrc>
#include "templwin.hxx"
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 891fd40e7128..55fee9ad9b50 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -74,6 +74,7 @@
#include <vcl/builderfactory.hxx>
#include <vcl/dialog.hxx>
#include <unotools/collatorwrapper.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/ucbhelper.hxx>
#include <unotools/intlwrapper.hxx>
#include <unotools/syslocale.hxx>
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 2b2cad1a1877..64f03e372d4e 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -20,6 +20,7 @@
#include <svtools/ivctrl.hxx>
#include "imivctl.hxx"
+#include <vcl/accessiblefactory.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/controllayout.hxx>
#include <vcl/mnemonic.hxx>
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index a5625a1a0001..be3c00c7b860 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -32,6 +32,7 @@
#include <comphelper/string.hxx>
#include <unotools/charclass.hxx>
#include <unotools/fontoptions.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <svtools/borderline.hxx>
#include <svtools/sampletext.hxx>
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 70a6ade68c71..00633ebed99f 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -22,6 +22,7 @@
#include <tools/debug.hxx>
#include <tools/fract.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 15416b88a880..430523330bb6 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -31,6 +31,7 @@
#include <vcl/settings.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/svtaccessiblefactory.hxx>
+#include <vcl/accessiblefactory.hxx>
#include <svtools/svtresid.hxx>
#include <svtools/strings.hrc>
#include <limits>
diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx
index 4075295ed258..d73296dcb3b9 100644
--- a/svtools/source/edit/textwindowpeer.cxx
+++ b/svtools/source/edit/textwindowpeer.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <vcl/svtaccessiblefactory.hxx>
+#include <vcl/accessiblefactory.hxx>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 47b19ff3704d..f44ffec85a69 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -43,6 +43,7 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index 51d8926915fa..8c2ef914cd24 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -8,6 +8,7 @@
*/
#include <comphelper/sequence.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <o3tl/string_view.hxx>
#include <officecfg/Office/Common.hxx>
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 344fe0f9d367..6696c80ac167 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -24,6 +24,7 @@
#include <table/tablecontrolinterface.hxx>
#include <vcl/svtaccessiblefactory.hxx>
+#include <vcl/accessiblefactory.hxx>
#include <vcl/seleng.hxx>
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index 83f6627bd2d6..d7e8b55db0a4 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -30,6 +30,7 @@
#include <comphelper/processfactory.hxx>
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
#include "lookupcolorname.hxx"
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 017545603101..a491e8210860 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -52,6 +52,8 @@
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
+#include <map>
+
using namespace css::uno;
using namespace css::lang;
using namespace css::graphic;
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 2806d52a4740..8273a70a7f8f 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -33,6 +33,7 @@
#include <comphelper/fileformat.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <unotools/localedatawrapper.hxx>
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 16a8c7bab4ec..0d9c51023985 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -22,10 +22,12 @@
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/bitmap.hxx>
+#include <vcl/bitmapex.hxx>
#include <vcl/field.hxx>
#include <vcl/settings.hxx>
#include <svtools/colorcfg.hxx>
#include <vcl/builderfactory.hxx>
+#include <i18nlangtag/languagetag.hxx>
namespace svx {
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index c8ec11e9dfee..293cc40f27dd 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -24,6 +24,7 @@
#include <vcl/settings.hxx>
#include <svtools/colorcfg.hxx>
#include <svx/swframeexample.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 817dedefb4e6..f0fc654b504b 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -45,6 +45,7 @@
#include <tools/gen.hxx>
#include <tools/diagnose_ex.h>
#include <connectivity/dbtools.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <set>
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index 82a7316c0589..e68ef416724b 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -13,6 +13,7 @@
#include <sfx2/sidebar/TabBar.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <vcl/layout.hxx>
+#include <vcl/accel.hxx>
using namespace sfx2::sidebar;
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index 6ed094b82551..d8cc86bf57e7 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -22,6 +22,7 @@
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/xlnwtit.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/viewoptions.hxx>
#include <vcl/svapp.hxx>
#include "LineWidthValueSet.hxx"
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index a9417d04cddd..bfd03eeb1905 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -35,6 +35,7 @@
#include <vcl/graph.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index e210f75cfdd9..5b6bfc6d8caa 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -29,6 +29,7 @@
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx>
#include <svx/dlgutil.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/viewoptions.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index a3c40a649db2..5f48559de63f 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -17,6 +17,7 @@
#include <svx/xlineit0.hxx>
#include <svx/xtable.hxx>
#include <svtools/valueset.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/pathoptions.hxx>
#include <svx/xattr.hxx>
#include <svx/svddef.hxx>
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 6f7c594d6076..4a38f806f902 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -44,6 +44,7 @@
#include <tools/bigint.hxx>
#include <tools/stream.hxx>
#include <unotools/intlwrapper.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 620152e6e052..7c4f9f670097 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -11,6 +11,7 @@
#include <com/sun/star/text/XNumberingFormatter.hpp>
#include <comphelper/propertysequence.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <svtools/popupwindowcontroller.hxx>
#include <svtools/toolbarmenu.hxx>
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 934b8907cf38..24ac4d4ed087 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/media/ZoomLevel.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/lang/Locale.hpp>
#include <tools/fldunit.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/propertysetinfo.hxx>
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index bb294863e90d..9f9fed843981 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -60,6 +60,7 @@
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <unotools/intlwrapper.hxx>
+#include <unotools/syslocale.hxx>
#include <vcl/gradient.hxx>
#include <libxml/xmlwriter.h>
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 53db25145550..19a53bd83031 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -30,6 +30,7 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implbase5.hxx>
+#include <tools/color.hxx>
#include "unobaseclass.hxx"
class SwDoc;
diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx b/sw/qa/extras/rtfexport/rtfexport2.cxx
index e5b2fd4f958b..90f909b4e188 100644
--- a/sw/qa/extras/rtfexport/rtfexport2.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport2.cxx
@@ -45,6 +45,7 @@
#include <vcl/settings.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <comphelper/sequenceashashmap.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <bordertest.hxx>
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index b49e1e75e7cd..6563636a7a22 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -94,6 +94,7 @@
#include <o3tl/deleter.hxx>
#include <o3tl/make_unique.hxx>
#include <osl/file.hxx>
+#include <osl/thread.hxx>
#include <paratr.hxx>
#include <drawfont.hxx>
#include <txtfrm.hxx>
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index b60cf277560d..4f18aa6ed6b5 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -29,6 +29,7 @@
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <viewsh.hxx>
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index fa258e82ae53..65436e89bfb2 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/util/SearchFlags.hpp>
#include <i18nlangtag/languagetag.hxx>
#include <i18nutil/searchopt.hxx>
+#include <unotools/syslocale.hxx>
#include <hintids.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index ac172c00a94c..390590af3c59 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -28,6 +28,7 @@
#include <sfx2/printer.hxx>
#include <tools/globname.hxx>
#include <sal/log.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <fmtfsize.hxx>
#include <fmthdft.hxx>
#include <fmtcntnt.hxx>
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 1c36ad4bde67..158d13864ea3 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -50,6 +50,7 @@
#include <unordered_map>
#include <libxml/xmlwriter.h>
+#include <i18nlangtag/languagetag.hxx>
#include <unotools/saveopt.hxx>
#include <osl/diagnose.h>
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 2495fc8de524..f38d29f3f1a9 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/util/SearchAlgorithms2.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
+#include <i18nlangtag/languagetag.hxx>
#include <i18nutil/transliteration.hxx>
#include <i18nutil/searchopt.hxx>
#include <svl/fstathelper.hxx>
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index e5225f253b0b..410d0bd22944 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -22,6 +22,7 @@
#include <comphelper/string.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/langitem.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <o3tl/any.hxx>
#include <o3tl/make_unique.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index de02414bdaf5..b293eee9c0d2 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -28,6 +28,7 @@
#include <vcl/imap.hxx>
#include <vcl/imapobj.hxx>
#include <unotools/intlwrapper.hxx>
+#include <unotools/syslocale.hxx>
#include <frmfmt.hxx>
#include <unocoll.hxx>
#include <unosett.hxx>
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index ab2bae1d8aeb..21887c273740 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -35,6 +35,7 @@
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/memberids.h>
#include <hints.hxx>
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 51be7ff938a5..1ed8118a6fae 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -92,6 +92,7 @@
#include <fmthdft.hxx>
#include <vcl/svapp.hxx>
#include <unotools/syslocale.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <fmtflcnt.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/unolingu.hxx>
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 6e11a89aef8a..427791fc7e5d 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -26,6 +26,7 @@
#include <fchrfmt.hxx>
#include <osl/diagnose.h>
+#include <i18nlangtag/languagetag.hxx>
#include <i18nutil/searchopt.hxx>
#include <o3tl/any.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 1b9ec7ff55e2..ba64adad7be6 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -22,6 +22,7 @@
#include <osl/diagnose.h>
#include <rtl/character.hxx>
#include <rtl/ustrbuf.hxx>
+#include <tools/color.hxx>
#include <vcl/svapp.hxx>
#include <svtools/htmltokn.h>
#include <comphelper/string.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index cc034f072e1c..fa46377e8179 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -28,6 +28,7 @@
#include <vcl/menu.hxx>
#include <svl/undo.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <svl/languageoptions.hxx>
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 84927a6a8d13..6e976c23ec6c 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -43,6 +43,7 @@
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <vcl/decoview.hxx>
#include <vcl/gradient.hxx>
+#include <vcl/metric.hxx>
#include <vcl/menubtn.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index f95dd0769462..404640def978 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -26,6 +26,7 @@
#include <svx/pageitem.hxx>
#include <svx/sidebar/ValueSetWithTextControl.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <rtl/character.hxx>
#include <editeng/paperinf.hxx>
#include <sfx2/bindings.hxx>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 69094de12fbb..845760540140 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -56,6 +56,7 @@
#include <sfx2/bindings.hxx>
#include <editeng/lrspitem.hxx>
#include <unotools/textsearch.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <editeng/unolingu.hxx>
#include <vcl/weld.hxx>
#include <editeng/tstpitem.hxx>
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 2295146d2db2..5ad9260f5739 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -26,6 +26,7 @@
#include <editeng/itemtype.hxx>
#include <editeng/eerdll.hxx>
#include <unotools/intlwrapper.hxx>
+#include <unotools/syslocale.hxx>
#include <rtl/ustrbuf.hxx>
#include <fmtanchr.hxx>
#include <fmtfsize.hxx>
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index aa86bb0c9606..7257c6167e16 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/supportsservice.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/convert.hxx>
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 71a2be7b0e4b..782ea2121804 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -51,7 +51,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <osl/conditn.hxx>
#include <osl/module.h>
-#include <osl/thread.h>
+#include <osl/thread.hxx>
#include <osl/mutex.hxx>
#include <rtl/uuid.h>
#include <rtl/process.h>
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index f17ae53c14c0..d56ae124b781 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -38,6 +38,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <tools/diagnose_ex.h>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index 3c2da9f6586e..08b1f8f5032b 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -18,6 +18,7 @@
*/
#include <unotools/datetime.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <tools/date.hxx>
#include <tools/time.hxx>
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 62a51ec35f07..3297bbec5fd0 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -41,6 +41,7 @@
#include <comphelper/automationinvokedzone.hxx>
#include <comphelper/processfactory.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 093298ca1c4c..1e2af987fd56 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -29,6 +29,7 @@
#include <basegfx/vector/b2ivector.hxx>
#include <basegfx/range/b2ibox.hxx>
#include <o3tl/safeint.hxx>
+#include <tools/helpers.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/bitmap.hxx>
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 0b4bd8d377ea..ace3e53ed3ef 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -28,6 +28,7 @@
#include <saldatabasic.hxx>
#include <sal/log.hxx>
+#include <tools/helpers.hxx>
#include <o3tl/safeint.hxx>
#include <vcl/BitmapTools.hxx>
#include <vcl/sysdata.hxx>
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 7a89e82e057f..9e58c3bd38e0 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_VCL_INC_SALBMP_HXX
#include <tools/gen.hxx>
+#include <tools/solar.h>
#include <vcl/checksum.hxx>
#include <vcl/salbtype.hxx>
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index b83607f75c44..208e180ceeba 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -24,6 +24,7 @@
#include <tools/fldunit.hxx>
#include <unotools/options.hxx>
+#include <vcl/bitmapex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/task.hxx>
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 37fb6b3e11c6..35666866fb72 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <sal/log.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/print.hxx>
#include <vcl/image.hxx>
#include <vcl/virdev.hxx>
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 0d3a7752e2fa..093a72b40151 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -24,6 +24,7 @@
#include <osl/process.h>
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/pngread.hxx>
#include <vcl/svapp.hxx>
#include <vcl/vectorgraphicdata.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index df40054c98b8..d4a2c3464171 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -33,6 +33,7 @@
#include <messagedialog.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <utility>
+#include <tools/helpers.hxx>
#include <vcl/builder.hxx>
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 193e1155242f..50dce10343b2 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -51,6 +51,7 @@
#include <unotools/collatorwrapper.hxx>
#include <unotools/confignode.hxx>
#include <unotools/configmgr.hxx>
+#include <unotools/syslocale.hxx>
#include <unotools/syslocaleoptions.hxx>
using namespace ::com::sun::star;
diff --git a/vcl/source/bitmap/BitmapColorizeFilter.cxx b/vcl/source/bitmap/BitmapColorizeFilter.cxx
index 4ec5bfe75d32..c102f9acf94e 100644
--- a/vcl/source/bitmap/BitmapColorizeFilter.cxx
+++ b/vcl/source/bitmap/BitmapColorizeFilter.cxx
@@ -9,6 +9,7 @@
*/
#include <tools/color.hxx>
+#include <tools/helpers.hxx>
#include <basegfx/color/bcolortools.hxx>
#include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
index 5d2d6728e9f8..a04ab5b08652 100644
--- a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
+++ b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
@@ -10,6 +10,7 @@
#include <basegfx/color/bcolortools.hxx>
+#include <tools/helpers.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
index 9fdf7aac4bc4..6af3dfa2bf7c 100644
--- a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
+++ b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
@@ -10,6 +10,7 @@
#include <sal/config.h>
+#include <tools/helpers.hxx>
#include <o3tl/clamp.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
diff --git a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
index d12f086786ba..990a3f090056 100644
--- a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
+++ b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
@@ -10,6 +10,7 @@
#include <basegfx/color/bcolortools.hxx>
+#include <tools/helpers.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx b/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
index 95345ae88fbe..7375d0260dfb 100644
--- a/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
@@ -19,6 +19,7 @@
#include <osl/diagnose.h>
+#include <tools/helpers.hxx>
#include <vcl/bitmapaccess.hxx>
#include <bitmapwriteaccess.hxx>
diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index 27baa334b839..9f4eabfb4c7d 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -19,6 +19,7 @@
#include <comphelper/threadpool.hxx>
+#include <tools/helpers.hxx>
#include <vcl/bitmapaccess.hxx>
#include <bitmapwriteaccess.hxx>
diff --git a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
index 85a5774f1a1d..402e90441c4e 100644
--- a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
+++ b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
@@ -10,6 +10,7 @@
#include <basegfx/color/bcolortools.hxx>
+#include <tools/helpers.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 4bac9745795e..ab21b082ad40 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -35,6 +35,7 @@
#endif
#include <tools/diagnose_ex.h>
#include <tools/fract.hxx>
+#include <tools/helpers.hxx>
#include <tools/stream.hxx>
#include <bitmapwriteaccess.hxx>
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index 7a9b025e906d..a63c0b49d590 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -18,6 +18,7 @@
*/
#include <osl/diagnose.h>
+#include <tools/helpers.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapaccess.hxx>
#include <vcl/outdev.hxx>
diff --git a/vcl/source/bitmap/bitmappaint.cxx b/vcl/source/bitmap/bitmappaint.cxx
index 7f754997d694..02df3c8a6b29 100644
--- a/vcl/source/bitmap/bitmappaint.cxx
+++ b/vcl/source/bitmap/bitmappaint.cxx
@@ -18,6 +18,7 @@
*/
#include <tools/poly.hxx>
+#include <tools/helpers.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapaccess.hxx>
#include <vcl/alpha.hxx>
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index be35941fe775..12b9b8943d8e 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -62,6 +62,7 @@
#include <sal/macros.h>
#include <sal/log.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/unohelp2.hxx>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 263d8231c715..fba89942e081 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -18,6 +18,7 @@
*/
#include <memory>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/builder.hxx>
#include <vcl/decoview.hxx>
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index ea7fc536a041..6112735f55c3 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -18,6 +18,7 @@
*/
#include <i18nutil/searchopt.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/xtextedt.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 643b63247513..ac01d6f18aa1 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -28,6 +28,7 @@
#include <vcl/bitmapaccess.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
+#include <tools/helpers.hxx>
#include <tools/stream.hxx>
#define BUFFER_SIZE 4096
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 0d1f8eced642..facf98ec466e 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -26,6 +26,7 @@
#include <config_features.h>
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <tools/helpers.hxx>
#if HAVE_FEATURE_OPENGL
#include <vcl/opengl/OpenGLHelper.hxx>
#endif
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 93318fbd30ae..ce121c00f9d8 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -19,6 +19,7 @@
#include <bmpfast.hxx>
#include <vcl/bitmapaccess.hxx>
+#include <vcl/salgtype.hxx>
#include <bitmapwriteaccess.hxx>
#define FAST_ARGB_BGRA
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 2c44af9ccc71..07c7c043f2d6 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -28,6 +28,7 @@
#include <tools/zcodec.hxx>
#include <tools/stream.hxx>
#include <tools/fract.hxx>
+#include <tools/helpers.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bitmapaccess.hxx>
#include <vcl/outdev.hxx>
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 0262c4b6b8d8..c1f2b9e92e42 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -22,6 +22,7 @@
#include <memory>
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <tools/helpers.hxx>
#include <tools/stream.hxx>
#include <tools/vcompat.hxx>
#include <tools/fract.hxx>
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index fc69daf1b082..67d54d5fe77e 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -23,6 +23,7 @@
#include <o3tl/make_unique.hxx>
#include <vcl/bitmapaccess.hxx>
#include <tools/poly.hxx>
+#include <tools/helpers.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index af08ca7a3e6c..085381e6fae0 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -52,6 +52,7 @@
#include <svl/urihelper.hxx>
#include <tools/debug.hxx>
#include <tools/fract.hxx>
+#include <tools/helpers.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
#include <tools/zcodec.hxx>
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index d7b7cf29ba80..eb62f65a69eb 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -30,6 +30,7 @@
#include <unotools/streamwrap.hxx>
+#include <tools/helpers.hxx>
#include <tools/fract.hxx>
#include <tools/stream.hxx>
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index 4122c5f0d82e..98dc91c3342c 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -21,6 +21,7 @@
#include <vcl/bitmapex.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
#include <cmath>
#include <limits>
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index 1e4a4870c1a9..d07ee741b618 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -19,10 +19,12 @@
#include <vcl/bitmapaccess.hxx>
#include <vcl/salbtype.hxx>
+#include <vcl/salgtype.hxx>
#include <bmpfast.hxx>
#include <o3tl/safeint.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
+#include <tools/helpers.hxx>
#include <memory>
#define IMPL_CASE_GET_FORMAT( Format ) \
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index b78625fb54ad..72ce02ed2642 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -49,6 +49,7 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <sal/log.hxx>
+#include <tools/helpers.hxx>
#include <tools/poly.hxx>
#include <tools/diagnose_ex.h>
#include <rtl/uuid.h>
diff --git a/vcl/source/helper/svtaccessiblefactory.cxx b/vcl/source/helper/svtaccessiblefactory.cxx
index 2f1410048cb7..c545e3c76ae0 100644
--- a/vcl/source/helper/svtaccessiblefactory.cxx
+++ b/vcl/source/helper/svtaccessiblefactory.cxx
@@ -20,6 +20,7 @@
#include <config_features.h>
#include <vcl/svtaccessiblefactory.hxx>
+#include <vcl/accessiblefactory.hxx>
#include <tools/svlibrary.h>
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 7823a1665221..4ad7d40b397a 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -45,6 +45,7 @@
#include <bitmapwriteaccess.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <tools/helpers.hxx>
void OutputDevice::DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap )
{
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index a0879f503b51..e93f44ac9a69 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -21,6 +21,7 @@
#include <tools/line.hxx>
#include <tools/stream.hxx>
+#include <tools/helpers.hxx>
#include <vcl/hatch.hxx>
#include <vcl/metaact.hxx>
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index ce072678a7f2..205de6baaec1 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -20,6 +20,7 @@
#include <cassert>
#include <sal/types.h>
+#include <tools/helpers.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <memory>
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 78be5057c96e..8ebbef7b23d6 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -35,6 +35,7 @@
#include <bitmaps.hlst>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/treelistentry.hxx>
#include <vcl/viewdataentry.hxx>
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index c797911edfa6..e78274b74bdd 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -18,6 +18,7 @@
*/
#include <vcl/svtaccessiblefactory.hxx>
+#include <vcl/accessiblefactory.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svlbitm.hxx>
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index cc79854dfb41..98b7f6a7cfae 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -24,6 +24,7 @@
*/
#include <vcl/treelistbox.hxx>
+#include <vcl/accessiblefactory.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <vcl/svapp.hxx>
#include <vcl/accel.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 210982ddb365..ba0281bacc4c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -18,6 +18,7 @@
#include <osl/module.hxx>
#include <osl/file.hxx>
#include <sal/log.hxx>
+#include <unotools/localedatawrapper.hxx>
#include <unotools/resmgr.hxx>
#include <vcl/builder.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index dda51ab396a8..cb039abba23e 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -32,6 +32,7 @@
#include <vcl/settings.hxx>
#include <vcl/unohelp.hxx>
#include <sal/log.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/i18n/XCharacterClassification.hpp>
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 53a40c35c752..494c1500020f 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -19,6 +19,7 @@
#include <tools/time.hxx>
#include <sal/log.hxx>
+#include <vcl/accel.hxx>
#include <vcl/event.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/dockwin.hxx>
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index f4a3b7136897..42a21c6fca07 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -24,6 +24,7 @@
#include <vcl/unohelp.hxx>
#include <com/sun/star/i18n/XCharacterClassification.hpp>
+#include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <rtl/character.hxx>
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index 636e5febec71..cd0c17bdc624 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <vcl/event.hxx>
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 72f2eb5bf46d..7869b92a08a0 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -24,6 +24,7 @@
#include <cstdlib>
+#include <vcl/accel.hxx>
#include <vcl/layout.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 8cfd6243f9fe..c9bff3225700 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <vcl/accel.hxx>
#include <vcl/event.hxx>
#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index b7cea507df7e..0f8703a28031 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -31,6 +31,7 @@
#include <osl/endian.h>
#include <sal/log.hxx>
+#include <tools/helpers.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/salbtype.hxx>
#include <com/sun/star/beans/XFastPropertySet.hpp>
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 125d0c29aba4..a7ef431c3340 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <comphelper/string.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/ppdparser.hxx>
#include <vcl/strhelper.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 4facd6011646..d0d45527055b 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -36,6 +36,7 @@
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <i18nlangtag/languagetag.hxx>
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 22e553bc8991..070d8b9255a1 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -32,6 +32,7 @@
#include <sal/log.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
+#include <tools/helpers.hxx>
#include <tools/fract.hxx>
#include <tools/stream.hxx>
#include <unotools/resmgr.hxx>
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index fcdd4b984e1d..3fe763daa16f 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -28,6 +28,7 @@
#include <vcl/timer.hxx>
#include <cppuhelper/basemutex.hxx>
#include <sal/log.hxx>
+#include <tools/helpers.hxx>
#include <map>
#if defined _MSC_VER
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index d68c18e89e49..6fe5130b4c11 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -24,6 +24,7 @@
#include "AccTextBase.h"
+#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 9c8f5e5d3a58..ae05b724e8ce 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -43,6 +43,7 @@
#include "AccHypertext.h"
#include "AccHyperLink.h"
+#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
#include <comphelper/AccessibleImplementationHelper.hxx>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0dd4b04d59a2..8853941cfe35 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -16,6 +16,7 @@
#include <com/sun/star/text/WrapTextMode.hpp>
#include <com/sun/star/text/TextContentAnchorType.hpp>
#include <o3tl/clamp.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/streamwrap.hxx>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 7871604a787d..8a54381ac576 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -30,6 +30,7 @@
#include <strings.hrc>
#include <iostream>
+#include <map>
using namespace ::com::sun::star;
diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx b/writerperfect/source/writer/EPUBExportDialog.cxx
index 9b3d5618a492..f359098000e8 100644
--- a/writerperfect/source/writer/EPUBExportDialog.cxx
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -17,6 +17,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <sfx2/opengrf.hxx>
#include <sax/tools/converter.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include "EPUBExportFilter.hxx"
More information about the Libreoffice-commits
mailing list