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@collabora.com>
2018-12-03 18:58:38 +01:00 · 2018-12-03 18:58:38 +01:00 · 00b49f9ff9
commit 00b49f9ff9
parent 0005b330ea
218 changed files with 224 additions and 52 deletions
--- 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- 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>
--- 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()
 {
--- 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>
--- 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")
--- 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>
--- 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;
--- 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
--- 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;
--- 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>
--- a/Show More
+++ b/Show More