[Libreoffice-commits] core.git: basctl/source chart2/source cui/source editeng/source filter/source include/editeng include/IwyuFilter_include.yaml include/svl sc/qa sc/source sd/source sfx2/source svl/qa svl/source svtools/source svx/source sw/source
Gabor Kelemen (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 7 07:06:54 UTC 2019
basctl/source/basicide/IDEComboBox.cxx | 1 +
chart2/source/view/main/ChartView.cxx | 1 +
cui/source/customize/cfg.cxx | 1 +
cui/source/tabpages/grfpage.cxx | 1 +
editeng/source/editeng/editeng.cxx | 1 +
editeng/source/editeng/editview.cxx | 1 +
editeng/source/editeng/impedit4.cxx | 1 +
filter/source/msfilter/escherex.cxx | 1 +
include/IwyuFilter_include.yaml | 4 ++++
include/editeng/outlobj.hxx | 1 +
include/svl/adrparse.hxx | 1 +
include/svl/custritm.hxx | 1 -
include/svl/eitem.hxx | 1 -
include/svl/itemprop.hxx | 1 -
include/svl/msodocumentlockfile.hxx | 2 --
include/svl/style.hxx | 2 +-
sc/qa/unit/screenshots/screenshots.cxx | 1 +
sc/source/core/data/column4.cxx | 1 +
sc/source/core/data/table7.cxx | 2 ++
sc/source/filter/dif/difimp.cxx | 1 +
sc/source/filter/html/htmlexp2.cxx | 1 +
sc/source/filter/rtf/rtfexp.cxx | 1 +
sc/source/ui/docshell/datastream.cxx | 1 +
sd/source/filter/xml/sdxmlwrp.cxx | 1 +
sd/source/ui/func/fuinsfil.cxx | 1 +
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 1 +
sd/source/ui/unoidl/unopage.cxx | 2 ++
sd/source/ui/view/drawview.cxx | 1 +
sd/source/ui/view/sdview4.cxx | 1 +
sfx2/source/dialog/dinfdlg.cxx | 1 +
sfx2/source/doc/SfxRedactionHelper.cxx | 1 +
sfx2/source/doc/objxtor.cxx | 1 +
svl/qa/unit/items/stylepool.cxx | 1 -
svl/qa/unit/lockfiles/test_lockfiles.cxx | 1 -
svl/qa/unit/svl.cxx | 8 ++------
svl/qa/unit/test_INetContentType.cxx | 1 -
svl/qa/unit/test_URIHelper.cxx | 5 -----
svl/source/config/asiancfg.cxx | 2 --
svl/source/config/cjkoptions.cxx | 1 -
svl/source/config/ctloptions.cxx | 4 ----
svl/source/config/itemholder2.cxx | 1 -
svl/source/crypto/cryptosign.cxx | 7 -------
svl/source/fsstor/fsfactory.cxx | 2 --
svl/source/fsstor/fsstorage.cxx | 13 +++----------
svl/source/fsstor/fsstorage.hxx | 8 ++------
svl/source/fsstor/ostreamcontainer.hxx | 2 --
svl/source/inc/poolio.hxx | 2 --
svl/source/items/cenumitm.cxx | 1 -
svl/source/items/cintitem.cxx | 1 -
svl/source/items/custritm.cxx | 1 -
svl/source/items/flagitem.cxx | 1 -
svl/source/items/globalnameitem.cxx | 2 --
svl/source/items/grabbagitem.cxx | 2 +-
svl/source/items/ilstitem.cxx | 1 -
svl/source/items/int64item.cxx | 1 -
svl/source/items/intitem.cxx | 1 -
svl/source/items/itemiter.cxx | 1 -
svl/source/items/itemprop.cxx | 1 +
svl/source/items/itemset.cxx | 6 ------
svl/source/items/lckbitem.cxx | 2 --
svl/source/items/poolcach.cxx | 2 --
svl/source/items/poolio.cxx | 2 --
svl/source/items/poolitem.cxx | 1 -
svl/source/items/ptitem.cxx | 1 -
svl/source/items/rectitem.cxx | 1 -
svl/source/items/rngitem.cxx | 2 --
svl/source/items/sitem.cxx | 1 -
svl/source/items/slstitm.cxx | 3 +--
svl/source/items/srchitem.cxx | 6 +-----
svl/source/items/stritem.cxx | 1 -
svl/source/items/style.cxx | 2 --
svl/source/items/visitem.cxx | 1 -
svl/source/misc/documentlockfile.cxx | 9 ---------
svl/source/misc/getstringresource.cxx | 3 ---
svl/source/misc/gridprinter.cxx | 2 +-
svl/source/misc/inethist.cxx | 1 -
svl/source/misc/inettype.cxx | 5 -----
svl/source/misc/lockfilecommon.cxx | 7 -------
svl/source/misc/msodocumentlockfile.cxx | 1 -
svl/source/misc/ownlist.cxx | 4 +++-
svl/source/misc/sharecontrolfile.cxx | 8 --------
svl/source/misc/strmadpt.cxx | 4 ----
svl/source/misc/urihelper.cxx | 1 -
svl/source/notify/listener.cxx | 1 -
svl/source/notify/lstner.cxx | 1 -
svl/source/numbers/numfmuno.cxx | 1 -
svl/source/numbers/numfmuno.hxx | 1 -
svl/source/numbers/numuno.cxx | 1 -
svl/source/numbers/supservs.cxx | 5 +----
svl/source/numbers/zforfind.cxx | 1 -
svl/source/numbers/zforlist.cxx | 1 -
svl/source/numbers/zformat.cxx | 3 ---
svl/source/passwordcontainer/passwordcontainer.cxx | 3 +--
svl/source/passwordcontainer/passwordcontainer.hxx | 5 +----
svl/source/passwordcontainer/syscreds.cxx | 1 -
svl/source/uno/pathservice.cxx | 1 -
svtools/source/control/inettbc.cxx | 1 +
svx/source/dialog/ClassificationDialog.cxx | 1 +
svx/source/dialog/compressgraphicdialog.cxx | 1 +
svx/source/dialog/dlgctrl.cxx | 1 +
svx/source/sidebar/nbdtmg.cxx | 1 +
svx/source/svdraw/svdoole2.cxx | 1 +
svx/source/unodraw/unoshape.cxx | 1 +
svx/source/xoutdev/xattrbmp.cxx | 1 +
sw/source/core/layout/laycache.cxx | 1 +
sw/source/uibase/misc/redlndlg.cxx | 1 +
sw/source/uibase/shells/textfld.cxx | 1 +
107 files changed, 62 insertions(+), 160 deletions(-)
New commits:
commit 43ddddb703bcdb9430752af63ae46527f737f874
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Fri May 31 17:37:07 2019 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jun 7 09:06:14 2019 +0200
tdf#42949 Fix IWYU warnings in svl/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Except source/svdde/* which is WIN-specific
Also recheck include/svl
Change-Id: I32d3bcb6b14665c56c07a2f10526329b08c64cbe
Reviewed-on: https://gerrit.libreoffice.org/73630
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/basctl/source/basicide/IDEComboBox.cxx b/basctl/source/basicide/IDEComboBox.cxx
index 4e0ce4121a05..88c73f0c9d9c 100644
--- a/basctl/source/basicide/IDEComboBox.cxx
+++ b/basctl/source/basicide/IDEComboBox.cxx
@@ -28,6 +28,7 @@
#include <sfx2/frame.hxx>
#include <sfx2/sfxsids.hrc>
#include <svtools/langtab.hxx>
+#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <vcl/event.hxx>
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 9d3bf0bb46e6..f14dfd978a4d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -100,6 +100,7 @@
#include <sal/log.hxx>
#include <tools/diagnose_ex.h>
+#include <tools/stream.hxx>
#include <memory>
namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index f3c2c1dce224..d250a89834a1 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -50,6 +50,7 @@
#include <sfx2/filedlghelper.hxx>
#include <sfx2/sfxsids.hrc>
#include <svl/stritem.hxx>
+#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 46d3966a91ec..8c6788bc2592 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -30,6 +30,7 @@
#include <grfpage.hxx>
#include <svx/grfcrop.hxx>
#include <rtl/ustring.hxx>
+#include <tools/debug.hxx>
#include <tools/fract.hxx>
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 458f71b34d3f..cae8822cd48e 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -26,6 +26,7 @@
#include <vcl/svapp.hxx>
#include <svtools/ctrltool.hxx>
+#include <tools/stream.hxx>
#include <editeng/svxfont.hxx>
#include "impedit.hxx"
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 75624ea527d5..eb5bc6c69183 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -31,6 +31,7 @@
#include <svl/languageoptions.hxx>
#include <svtools/ctrltool.hxx>
#include <svtools/langtab.hxx>
+#include <tools/stream.hxx>
#include <vcl/graphicfilter.hxx>
#include <svl/srchitem.hxx>
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index d3f23c6ff786..0f77bd55f54f 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -58,6 +58,7 @@
#include "textconv.hxx"
#include <rtl/tencinfo.h>
#include <svtools/rtfout.hxx>
+#include <tools/stream.hxx>
#include <edtspell.hxx>
#include <editeng/scripttypeitem.hxx>
#include <editeng/unolingu.hxx>
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 0a9b2a4adf64..135cd493b35f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -36,6 +36,7 @@
#include <vcl/cvtgrf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
+#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/zcodec.hxx>
#include <tools/urlobj.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 2b69670aaeee..4cc5e4663bd7 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -269,6 +269,10 @@ blacklist:
include/svl/urihelper.hxx:
# base class has to be a complete type
- tools/link.hxx
+ include/svl/style.hxx:
+ # base class has to be a complete type
+ - com/sun/star/lang/XUnoTunnel.hpp
+ - com/sun/star/style/XStyle.hpp
include/vcl/FilterConfigItem.hxx:
# Needed on Windows with --disable-pch
- com/sun/star/beans/PropertyValue.hpp
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 38c142c905e3..364ec740b57f 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -23,6 +23,7 @@
#include <editeng/paragraphdata.hxx>
#include <editeng/editengdllapi.h>
#include <rtl/ustring.hxx>
+#include <svl/poolitem.hxx>
#include <svl/style.hxx>
#include <o3tl/cow_wrapper.hxx>
#include <memory>
diff --git a/include/svl/adrparse.hxx b/include/svl/adrparse.hxx
index 3c94b507522d..f19fc7ef0627 100644
--- a/include/svl/adrparse.hxx
+++ b/include/svl/adrparse.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SVL_ADRPARSE_HXX
#define INCLUDED_SVL_ADRPARSE_HXX
+#include <rtl/ustring.hxx>
#include <svl/svldllapi.h>
#include <vector>
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 5677c990569e..5ace7fa7c5c7 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVL_CUSTRITM_HXX
#include <svl/svldllapi.h>
-#include <tools/debug.hxx>
#include <svl/poolitem.hxx>
#include <cassert>
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 4d42498f1fb9..aaef90e75964 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -22,7 +22,6 @@
#include <svl/svldllapi.h>
#include <svl/cenumitm.hxx>
-#include <tools/stream.hxx>
template<typename EnumT>
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index 91472d1f7950..b0d94332f466 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -21,7 +21,6 @@
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <comphelper/propertysetinfo.hxx>
#include <cppuhelper/implbase.hxx>
#include <svl/itemset.hxx>
diff --git a/include/svl/msodocumentlockfile.hxx b/include/svl/msodocumentlockfile.hxx
index 322972fefe25..ef9759b5b29b 100644
--- a/include/svl/msodocumentlockfile.hxx
+++ b/include/svl/msodocumentlockfile.hxx
@@ -13,8 +13,6 @@
#include <svl/svldllapi.h>
#include <svl/documentlockfile.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
-
#define MSO_WORD_LOCKFILE_SIZE 162
#define MSO_EXCEL_AND_POWERPOINT_LOCKFILE_SIZE 165
#define MSO_USERNAME_MAX_LENGTH 52
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 2f35e91be4e7..23a35f09c751 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -29,10 +29,10 @@
#include <svl/svldllapi.h>
#include <svl/hint.hxx>
#include <svl/lstner.hxx>
-#include <svl/poolitem.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <svl/stylesheetuser.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <tools/mapunit.hxx>
#include <tools/solar.h>
#include <memory>
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index c99d587522da..63a53baf1f5d 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -13,6 +13,7 @@
#include <sfx2/sfxdlg.hxx>
#include <svx/numinf.hxx>
#include <svx/svxids.hrc>
+#include <tools/stream.hxx>
#include <tabvwsh.hxx>
#include <docsh.hxx>
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index d0e54711a5b7..4485de036c8d 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -32,6 +32,7 @@
#include <svl/sharedstringpool.hxx>
#include <sal/log.hxx>
+#include <tools/stream.hxx>
#include <numeric>
#include <vector>
diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index 1b903f45423d..48576f0d6018 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -20,6 +20,8 @@
#include <drwlayer.hxx>
#include <compressedarray.hxx>
+#include <tools/stream.hxx>
+
bool ScTable::IsMerged( SCCOL nCol, SCROW nRow ) const
{
if (!ValidCol(nCol) || nCol >= GetAllocatedColumnsCount() )
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 4040f4adb67e..1add7d6d61d7 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -18,6 +18,7 @@
*/
#include <svl/zforlist.hxx>
+#include <tools/stream.hxx>
#include <osl/diagnose.h>
#include <dif.hxx>
#include <docpool.hxx>
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 85299789c6f5..216d4f086591 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -26,6 +26,7 @@
#include <svtools/htmlkywd.hxx>
#include <svtools/htmlout.hxx>
#include <svl/urihelper.hxx>
+#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
#include <htmlexp.hxx>
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 22570bb1d10b..109087229d47 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -25,6 +25,7 @@
#include <editeng/justifyitem.hxx>
#include <svtools/rtfout.hxx>
#include <svtools/rtfkeywd.hxx>
+#include <tools/stream.hxx>
#include <rtfexp.hxx>
#include <cellvalue.hxx>
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index 56629391a027..ded5bbead7e0 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -15,6 +15,7 @@
#include <osl/time.h>
#include <salhelper/thread.hxx>
#include <sfx2/viewfrm.hxx>
+#include <tools/stream.hxx>
#include <vcl/svapp.hxx>
#include <docsh.hxx>
#include <tabvwsh.hxx>
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index ae06c34820c1..3c9cf80ab33b 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -75,6 +75,7 @@
#include <strings.hrc>
#include <sfx2/frame.hxx>
+#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
using namespace com::sun::star;
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 81a8da28fd64..8f3f652a1bcd 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -37,6 +37,7 @@
#include <sfx2/fcontnr.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svxids.hrc>
+#include <tools/debug.hxx>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 8e669d3cec97..0355be1ce110 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -33,6 +33,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/propertysethelper.hxx>
#include <comphelper/propertysetinfo.hxx>
+#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <svx/xtable.hxx>
#include <vcl/svapp.hxx>
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 55186e478033..55704fc9e252 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -71,6 +71,8 @@
#include <vcl/dibtools.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdoashp.hxx>
+#include <tools/debug.hxx>
+#include <tools/stream.hxx>
using ::com::sun::star::animations::XAnimationNode;
using ::com::sun::star::animations::XAnimationNodeSupplier;
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index b67fb350ca3a..702e7bd08cc6 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -37,6 +37,7 @@
#include <editeng/numitem.hxx>
#include <svl/whiter.hxx>
#include <sal/log.hxx>
+#include <tools/debug.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 05233c4a52af..899c56325b45 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -65,6 +65,7 @@
#include <svtools/soerr.hxx>
#include <sfx2/ipclient.hxx>
#include <svx/svdoashp.hxx>
+#include <tools/debug.hxx>
using namespace com::sun::star;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index b3c62360c692..fb712abc60fd 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -20,6 +20,7 @@
#include <svl/eitem.hxx>
#include <svl/urihelper.hxx>
#include <tools/datetime.hxx>
+#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/svapp.hxx>
diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx b/sfx2/source/doc/SfxRedactionHelper.cxx
index 59203b6467ec..427972047c02 100644
--- a/sfx2/source/doc/SfxRedactionHelper.cxx
+++ b/sfx2/source/doc/SfxRedactionHelper.cxx
@@ -33,6 +33,7 @@
#include <svtools/DocumentToGraphicRenderer.hxx>
#include <tools/gen.hxx>
+#include <tools/stream.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/graph.hxx>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 375b3919d291..00224f3cbda2 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -73,6 +73,7 @@
#include <svtools/asynclink.hxx>
#include <tools/diagnose_ex.h>
#include <tools/globname.hxx>
+#include <tools/debug.hxx>
#include <comphelper/classids.hxx>
#include <sfx2/app.hxx>
diff --git a/svl/qa/unit/items/stylepool.cxx b/svl/qa/unit/items/stylepool.cxx
index 5f37dc929aa7..2cc37b8d3bdc 100644
--- a/svl/qa/unit/items/stylepool.cxx
+++ b/svl/qa/unit/items/stylepool.cxx
@@ -13,7 +13,6 @@
#include <svl/itemset.hxx>
#include <svl/stylepool.hxx>
#include <svl/stritem.hxx>
-#include <sal/log.hxx>
namespace
{
diff --git a/svl/qa/unit/lockfiles/test_lockfiles.cxx b/svl/qa/unit/lockfiles/test_lockfiles.cxx
index b6c110ed6e48..076d699484bb 100644
--- a/svl/qa/unit/lockfiles/test_lockfiles.cxx
+++ b/svl/qa/unit/lockfiles/test_lockfiles.cxx
@@ -18,7 +18,6 @@
#include <svl/documentlockfile.hxx>
#include <svl/msodocumentlockfile.hxx>
#include <unotools/useroptions.hxx>
-#include <comphelper/sequence.hxx>
#include <tools/stream.hxx>
#include <rtl/strbuf.hxx>
#include <osl/security.hxx>
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index cd68d7472427..4a781627f9bc 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -15,18 +15,14 @@
#include <cppunit/plugin/TestPlugIn.h>
#include <sal/config.h>
-#include <osl/file.hxx>
-#include <osl/process.h>
-#include <rtl/ustrbuf.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <comphelper/processfactory.hxx>
-#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
-#include <com/sun/star/sheet/GeneralFunction.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <i18nlangtag/lang.h>
@@ -40,7 +36,7 @@
#include <unotools/syslocale.hxx>
#include <memory>
-#include <unicode/calendar.h>
+#include <unicode/timezone.h>
using namespace ::com::sun::star;
using namespace svl;
diff --git a/svl/qa/unit/test_INetContentType.cxx b/svl/qa/unit/test_INetContentType.cxx
index 8495d2d93273..e4a464e479f2 100644
--- a/svl/qa/unit/test_INetContentType.cxx
+++ b/svl/qa/unit/test_INetContentType.cxx
@@ -13,7 +13,6 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
-#include <cppunit/TestSuite.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/ustring.hxx>
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index a30de1540af9..e4dfbb9dd939 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -22,9 +22,7 @@
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ucb/Command.hpp>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <com/sun/star/ucb/IllegalIdentifierException.hpp>
#include <com/sun/star/ucb/UniversalContentBroker.hpp>
#include <com/sun/star/ucb/XCommandProcessor.hpp>
@@ -39,16 +37,13 @@
#include <com/sun/star/uri/XUriReference.hpp>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/implbase.hxx>
-#include <cppunit/TestCase.h>
#include <cppunit/TestFixture.h>
-#include <cppunit/TestSuite.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/strbuf.hxx>
#include <rtl/string.h>
#include <rtl/string.hxx>
#include <rtl/textenc.h>
-#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
#include <sal/macros.h>
#include <sal/types.h>
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
index 27b5b5defc92..af8b6e95b230 100644
--- a/svl/source/config/asiancfg.cxx
+++ b/svl/source/config/asiancfg.cxx
@@ -34,8 +34,6 @@
#include <comphelper/configuration.hxx>
#include <comphelper/processfactory.hxx>
#include <officecfg/Office/Common.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <sal/types.h>
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 32cd9d5ce834..71054f564de4 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -23,7 +23,6 @@
#include <svl/languageoptions.hxx>
#include <i18nlangtag/lang.h>
#include <unotools/configitem.hxx>
-#include <tools/solar.h>
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <osl/mutex.hxx>
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 81bb44049a75..0723f47ac1a1 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -20,15 +20,11 @@
#include <svl/ctloptions.hxx>
-#include <svl/languageoptions.hxx>
-#include <i18nlangtag/mslangid.hxx>
#include <unotools/configitem.hxx>
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <osl/mutex.hxx>
#include <rtl/instance.hxx>
-#include <unotools/syslocale.hxx>
-#include <svl/hint.hxx>
#include "itemholder2.hxx"
using namespace ::com::sun::star;
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index b19ce9b644ca..d9182c8cc410 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.cxx
@@ -28,7 +28,6 @@
#include <svl/cjkoptions.hxx>
#include <svl/ctloptions.hxx>
-#include <svl/languageoptions.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/options.hxx>
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index a6cdd6b2c396..2ace6a9fbee0 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -24,16 +24,10 @@
#include <com/sun/star/security/XCertificate.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <filter/msfilter/mscodec.hxx>
-#include <sax/tools/converter.hxx>
-#include <unotools/calendarwrapper.hxx>
-#include <unotools/datetime.hxx>
-#include <xmloff/xmluconv.hxx>
-#include <tools/zcodec.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
#if HAVE_FEATURE_NSS && !defined(_WIN32)
// NSS headers for PDF signing
-#include <nss.h>
#include <cert.h>
#include <hasht.h>
#include <secerr.h>
@@ -57,7 +51,6 @@
#if HAVE_FEATURE_NSS
#include <com/sun/star/xml/crypto/XDigestContext.hpp>
-#include <com/sun/star/xml/crypto/XDigestContextSupplier.hpp>
#include <com/sun/star/xml/crypto/DigestID.hpp>
#include <com/sun/star/xml/crypto/NSSInitializer.hpp>
#include <mutex>
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 31fd68bd54a6..980113267806 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -20,10 +20,8 @@
#include <fsfactory.hxx>
#include <cppuhelper/factory.hxx>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index ebd730d116e9..344553b67c5f 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -17,26 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/InvalidStorageException.hpp>
#include <com/sun/star/embed/StorageWrappedTargetException.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/packages/NoEncryptionException.hpp>
#include <com/sun/star/packages/WrongPasswordException.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
-#include <com/sun/star/ucb/XProgressHandler.hpp>
-#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/ucb/InteractiveIOException.hpp>
#include <com/sun/star/ucb/IOErrorCode.hpp>
#include <com/sun/star/container/ElementExistException.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
@@ -47,12 +39,13 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <comphelper/fileurl.hxx>
+#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/exc_hlp.hxx>
+#include <osl/diagnose.h>
#include <tools/urlobj.hxx>
#include <unotools/ucbhelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index 4db99c0bda48..2bbdc5525879 100644
--- a/svl/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.hxx
@@ -23,15 +23,11 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/packages/NoEncryptionException.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/interfacecontainer.h>
#include <ucbhelper/content.hxx>
diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx
index 5d255f44aab3..543a2049c306 100644
--- a/svl/source/fsstor/ostreamcontainer.hxx
+++ b/svl/source/fsstor/ostreamcontainer.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVL_SOURCE_FSSTOR_OSTREAMCONTAINER_HXX
#define INCLUDED_SVL_SOURCE_FSSTOR_OSTREAMCONTAINER_HXX
-#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/embed/XExtendedStorageStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
@@ -30,7 +29,6 @@
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/io/XAsyncOutputMonitor.hpp>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <osl/mutex.hxx>
#include <memory>
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 971fb86c9b1d..207dffded624 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -20,11 +20,9 @@
#ifndef INCLUDED_SVL_SOURCE_INC_POOLIO_HXX
#define INCLUDED_SVL_SOURCE_INC_POOLIO_HXX
-#include <sal/log.hxx>
#include <svl/itempool.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <tools/debug.hxx>
-#include <deque>
#include <memory>
#include <o3tl/sorted_vector.hxx>
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 6646647d763e..c5e30b81ece3 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -18,7 +18,6 @@
*/
#include <com/sun/star/uno/Any.hxx>
-#include <tools/stream.hxx>
#include <svl/cenumitm.hxx>
#include <svl/eitem.hxx>
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index 4545a8ae2cc5..07728df344b2 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -18,7 +18,6 @@
*/
#include <com/sun/star/uno/Any.hxx>
-#include <tools/stream.hxx>
#include <svl/cintitem.hxx>
#include <sal/log.hxx>
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index 4cba9175d001..36a32d1ff34b 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -21,7 +21,6 @@
#include <osl/diagnose.h>
#include <unotools/intlwrapper.hxx>
-#include <tools/stream.hxx>
#include <svl/custritm.hxx>
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index 96db1c338413..fb2732a56a67 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -20,7 +20,6 @@
#include <svl/flagitem.hxx>
#include <svl/poolitem.hxx>
-#include <tools/stream.hxx>
#include <sal/log.hxx>
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index 74b9e1f580cb..529a3398c3b7 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -21,8 +21,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/script/Converter.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
#include <osl/diagnose.h>
#include <comphelper/processfactory.hxx>
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index e5d04da41d7d..191d7b35c74b 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -11,8 +11,8 @@
#include <sal/config.h>
#include <sal/log.hxx>
-#include <comphelper/sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
using namespace com::sun::star;
diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index 21fca8aa3173..75499d772252 100644
--- a/svl/source/items/ilstitem.cxx
+++ b/svl/source/items/ilstitem.cxx
@@ -18,7 +18,6 @@
*/
#include <com/sun/star/script/Converter.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx
index c32794a359ff..f128bc4d4275 100644
--- a/svl/source/items/int64item.cxx
+++ b/svl/source/items/int64item.cxx
@@ -8,7 +8,6 @@
*/
#include <svl/int64item.hxx>
-#include <tools/stream.hxx>
SfxInt64Item::SfxInt64Item( sal_uInt16 nWhich, sal_Int64 nVal ) :
SfxPoolItem(nWhich), mnValue(nVal)
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 70be1383349e..1345308281fa 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <osl/diagnose.h>
#include <tools/bigint.hxx>
-#include <tools/stream.hxx>
#include <svl/metitem.hxx>
#include <libxml/xmlwriter.h>
diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx
index cbe0f2f8ed03..2285122e0d87 100644
--- a/svl/source/items/itemiter.cxx
+++ b/svl/source/items/itemiter.cxx
@@ -19,7 +19,6 @@
#include <svl/itemiter.hxx>
-#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
SfxItemIter::SfxItemIter( const SfxItemSet& rItemSet )
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index c0beaf2614f4..ca9de98910d2 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -24,6 +24,7 @@
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <memory>
#include <unordered_map>
/*
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index bed2259d40ea..4841123eed0a 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -32,12 +32,6 @@
#include <svl/itemiter.hxx>
#include <svl/whiter.hxx>
-#include <tools/stream.hxx>
-#include <tools/solar.h>
-#include <rtl/string.hxx>
-
-#include <poolio.hxx>
-
static const sal_uInt16 nInitCount = 10; // Single USHORTs => 5 pairs without '0'
namespace
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 46e266d6204c..25cebefc01d5 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -18,9 +18,7 @@
*/
#include <svl/lckbitem.hxx>
-#include <svl/poolitem.hxx>
#include <tools/stream.hxx>
-#include <tools/solar.h>
#include <osl/diagnose.h>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index 05401669216c..1ff06ab402a0 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
@@ -18,8 +18,6 @@
*/
-#include <limits.h>
-
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <svl/poolcach.hxx>
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index a909450f4588..313c431e9866 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -20,9 +20,7 @@
#include <poolio.hxx>
#include <sal/log.hxx>
-#include <tools/solar.h>
#include <svl/itempool.hxx>
-#include <svl/SfxBroadcaster.hxx>
#include <algorithm>
#include <memory>
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index a5501dc907d8..1ee28f0352f0 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -19,7 +19,6 @@
#include <svl/poolitem.hxx>
-#include <tools/stream.hxx>
#include <unotools/intlwrapper.hxx>
#include <unotools/syslocale.hxx>
#include <osl/diagnose.h>
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index ed228db34e87..af634fcc201c 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <osl/diagnose.h>
-#include <tools/stream.hxx>
#include <tools/mapunit.hxx>
#include <svl/poolitem.hxx>
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 170bf76db521..5889140782a6 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
#include <osl/diagnose.h>
-#include <tools/stream.hxx>
#include <svl/poolitem.hxx>
#include <svl/memberid.h>
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 1cabc517eb79..6bc41e6976d0 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -19,8 +19,6 @@
#include <sal/config.h>
-#include <sal/log.hxx>
-#include <tools/stream.hxx>
#include <svl/rngitem.hxx>
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index 9d09e1103038..79a6aa93d414 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -24,7 +24,6 @@
#include <rtl/ustring.hxx>
#include <svl/itemset.hxx>
#include <svl/poolitem.hxx>
-#include <tools/stream.hxx>
#include <tools/debug.hxx>
SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) :
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index e366badc8167..db0b781bbac1 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -23,9 +23,8 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <osl/diagnose.h>
-#include <tools/stream.hxx>
-#include <stringio.hxx>
#include <rtl/ustrbuf.hxx>
+#include <tools/lineend.hxx>
SfxPoolItem* SfxStringListItem::CreateDefault() { return new SfxStringListItem; }
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index d8995e6b0a8f..e53df3a77518 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -25,11 +25,7 @@
#include <osl/diagnose.h>
#include <unotools/searchopt.hxx>
-#include <com/sun/star/util/XReplaceable.hpp>
-#include <com/sun/star/util/XSearchable.hpp>
-#include <com/sun/star/util/XSearchDescriptor.hpp>
-#include <com/sun/star/util/XPropertyReplace.hpp>
-#include <com/sun/star/util/XReplaceDescriptor.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <svl/memberid.h>
#include <i18nlangtag/languagetag.hxx>
diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx
index 131e468e6b99..503c5d4083ac 100644
--- a/svl/source/items/stritem.cxx
+++ b/svl/source/items/stritem.cxx
@@ -18,7 +18,6 @@
*/
#include <svl/stritem.hxx>
-#include <stringio.hxx>
#include <libxml/xmlwriter.h>
// class SfxStringItem
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index a563e5a00cbf..4ce1a225948a 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -23,7 +23,6 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <sal/log.hxx>
-#include <tools/tenccvt.hxx>
#include <osl/diagnose.h>
#include <unotools/intlwrapper.hxx>
#include <svl/hint.hxx>
@@ -33,7 +32,6 @@
#include <svl/IndexedStyleSheets.hxx>
#include <svl/itemiter.hxx>
#include <unotools/syslocale.hxx>
-#include <algorithm>
#include <comphelper/servicehelper.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index d1ad3efc01a2..ae821abcd5b5 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -20,7 +20,6 @@
#include <svl/visitem.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <osl/diagnose.h>
-#include <tools/stream.hxx>
// virtual
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index fe567d295f3f..bc3fe86ef819 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -18,7 +18,6 @@
*/
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/ucb/NameClashException.hpp>
@@ -30,24 +29,16 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XTruncate.hpp>
-#include <osl/time.h>
-#include <osl/security.hxx>
-#include <osl/socket.hxx>
#include <o3tl/enumrange.hxx>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
-#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <comphelper/processfactory.hxx>
-#include <unotools/bootstrap.hxx>
-
#include <ucbhelper/content.hxx>
-#include <unotools/useroptions.hxx>
-
#include <svl/documentlockfile.hxx>
using namespace ::com::sun::star;
diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx
index 9b0f14882b61..aece9a3007e5 100644
--- a/svl/source/misc/getstringresource.cxx
+++ b/svl/source/misc/getstringresource.cxx
@@ -19,10 +19,7 @@
#include <sal/config.h>
-#include <memory>
-#include <i18nlangtag/languagetag.hxx>
#include <rtl/ustring.hxx>
-#include <sal/types.h>
#include <svl/svlresid.hxx>
#include <unotools/resmgr.hxx>
diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
index 9ed7f43b41d5..e129457a8215 100644
--- a/svl/source/misc/gridprinter.cxx
+++ b/svl/source/misc/gridprinter.cxx
@@ -11,8 +11,8 @@
#include <rtl/ustrbuf.hxx>
#include <mdds/multi_type_vector_types.hpp>
-#include <mdds/multi_type_vector_trait.hpp>
#include <mdds/multi_type_vector_custom_func1.hpp>
+#include <mdds/multi_type_vector_macro.hpp>
#include <mdds/multi_type_matrix.hpp>
#include <iostream>
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 7c05b6ef423e..5dafe30d2ce2 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -25,7 +25,6 @@
#include <rtl/instance.hxx>
#include <rtl/crc.h>
#include <osl/getglobalmutex.hxx>
-#include <tools/solar.h>
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index f2bdd6c8f2f9..f92db768ddcb 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -20,16 +20,11 @@
#include <sal/config.h>
#include <array>
-#include <utility>
-#include <map>
#include <tools/wldcrd.hxx>
#include <tools/inetmime.hxx>
-#include <rtl/instance.hxx>
#include <osl/diagnose.h>
#include <svl/inettype.hxx>
-#include <svl/svlresid.hxx>
-#include <svl/svl.hrc>
namespace
{
diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index ce0bdd662290..fbcd27215c32 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
@@ -21,10 +21,6 @@
#include <stdio.h>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/ucb/InsertCommandArgument.hpp>
-#include <com/sun/star/ucb/NameClashException.hpp>
#include <com/sun/star/io/WrongFormatException.hpp>
#include <osl/time.h>
@@ -33,7 +29,6 @@
#include <osl/file.hxx>
#include <o3tl/enumrange.hxx>
-#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
@@ -41,8 +36,6 @@
#include <tools/urlobj.hxx>
#include <unotools/bootstrap.hxx>
-#include <ucbhelper/content.hxx>
-
#include <unotools/useroptions.hxx>
#include <salhelper/linkhelper.hxx>
diff --git a/svl/source/misc/msodocumentlockfile.cxx b/svl/source/misc/msodocumentlockfile.cxx
index e0fc562e7a27..3b57402b7166 100644
--- a/svl/source/misc/msodocumentlockfile.cxx
+++ b/svl/source/misc/msodocumentlockfile.cxx
@@ -8,7 +8,6 @@
*/
#include <svl/msodocumentlockfile.hxx>
-#include <sal/log.hxx>
#include <algorithm>
#include <ucbhelper/content.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index 572bd39f7a8d..5fbaef109a53 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/beans/PropertyValues.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/PropertyState.hpp>
#include <svl/ownlist.hxx>
diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index adfdb59bc1de..94805932741c 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -24,27 +24,19 @@
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/ucb/InteractiveIOException.hpp>
#include <com/sun/star/io/NotConnectedException.hpp>
-#include <com/sun/star/io/WrongFormatException.hpp>
-#include <osl/time.h>
-#include <osl/security.hxx>
-#include <osl/socket.hxx>
#include <o3tl/enumrange.hxx>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
-#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <comphelper/processfactory.hxx>
#include <ucbhelper/content.hxx>
#include <tools/stream.hxx>
-#include <unotools/bootstrap.hxx>
#include <unotools/streamwrap.hxx>
-#include <unotools/useroptions.hxx>
-
#include <svl/sharecontrolfile.hxx>
using namespace ::com::sun::star;
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 101984e0e068..0ffa3540c112 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -18,8 +18,6 @@
*/
-#include <functional>
-
#include <algorithm>
#include <limits>
#include <set>
@@ -31,8 +29,6 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <osl/diagnose.h>
-#include <rtl/alloc.h>
-#include <cppuhelper/queryinterface.hxx>
#include <svl/instrm.hxx>
#include <svl/outstrm.hxx>
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index dc60dee5f73f..7f137fb5a908 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -46,7 +46,6 @@
#include <rtl/character.hxx>
#include <rtl/instance.hxx>
#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <sal/log.hxx>
diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index 38856a835d4f..51564ce9b4b7 100644
--- a/svl/source/notify/listener.cxx
+++ b/svl/source/notify/listener.cxx
@@ -19,7 +19,6 @@
#include <svl/listener.hxx>
#include <svl/broadcast.hxx>
-#include <cassert>
SvtListener::QueryBase::QueryBase( sal_uInt16 nId ) : mnId(nId) {}
SvtListener::QueryBase::~QueryBase() {}
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index dcd380c86dec..fe6f2b8af4e2 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -19,7 +19,6 @@
#include <svl/lstner.hxx>
-#include <svl/hint.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <sal/backtrace.hxx>
#include <sal/log.hxx>
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 29024c7cc6f9..688d4e419a81 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -18,7 +18,6 @@
*/
#include <tools/color.hxx>
-#include <i18nlangtag/mslangid.hxx>
#include <o3tl/any.hxx>
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index 7be9b1aa2493..fbd7889ce8cd 100644
--- a/svl/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVL_SOURCE_NUMBERS_NUMFMUNO_HXX
#include <com/sun/star/util/XNumberFormatter2.hpp>
-#include <com/sun/star/util/XNumberFormatPreviewer.hpp>
#include <com/sun/star/util/XNumberFormats.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 4ac35a90f94b..db633f40554e 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -20,7 +20,6 @@
#include <svl/numuno.hxx>
#include "numfmuno.hxx"
-#include <svl/zforlist.hxx>
using namespace com::sun::star;
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 1188f6b0b784..629f2991b4f9 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -23,16 +23,13 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/weak.hxx>
-#include <i18nlangtag/mslangid.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <tools/debug.hxx>
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
-#include <tools/stream.hxx>
-#include <svl/instrm.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::io;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
using namespace ::utl;
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 0635739de77e..57fcbc6d8a47 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -19,7 +19,6 @@
#include <cstdlib>
#include <float.h>
-#include <errno.h>
#include <comphelper/string.hxx>
#include <sal/log.hxx>
#include <tools/date.hxx>
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 705e0624c785..85d9a90c9435 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -29,7 +29,6 @@
#include <unotools/configmgr.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <unotools/localedatawrapper.hxx>
-#include <unotools/calendarwrapper.hxx>
#include <com/sun/star/i18n/KNumberFormatUsage.hpp>
#include <com/sun/star/i18n/KNumberFormatType.hpp>
#include <com/sun/star/i18n/FormatElement.hpp>
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index daa9791dba3c..4248e03256f2 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -18,9 +18,6 @@
*/
#include <stdio.h>
-#include <float.h>
-#include <errno.h>
-#include <stdlib.h>
#include <string_view>
#include <comphelper/string.hxx>
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 5c59f976d8ec..ba86b8887e3d 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -20,17 +20,16 @@
#include "passwordcontainer.hxx"
-#include <unotools/pathoptions.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/task/MasterPasswordRequest.hpp>
#include <com/sun/star/task/NoMasterException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <osl/diagnose.h>
#include <rtl/character.hxx>
diff --git a/svl/source/passwordcontainer/passwordcontainer.hxx b/svl/source/passwordcontainer/passwordcontainer.hxx
index 878eeb8fadaf..09fb7e03629d 100644
--- a/svl/source/passwordcontainer/passwordcontainer.hxx
+++ b/svl/source/passwordcontainer/passwordcontainer.hxx
@@ -25,14 +25,11 @@
#include <com/sun/star/task/PasswordRequestMode.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/factory.hxx>
-#include <tools/stream.hxx>
#include <unotools/configitem.hxx>
#include <ucbhelper/interactionrequest.hxx>
diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index f438b3db7338..44e125d62861 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -18,7 +18,6 @@
*/
#include "syscreds.hxx"
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <osl/diagnose.h>
#include <comphelper/sequence.hxx>
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 90aeeddfc3ed..8017379c9c97 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -24,7 +24,6 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/frame/XConfigManager.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
namespace com { namespace sun { namespace star { namespace uno {
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index b59dd0fca228..e740a79e6584 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -43,6 +43,7 @@
#include <rtl/instance.hxx>
#include <sal/log.hxx>
#include <salhelper/thread.hxx>
+#include <tools/debug.hxx>
#include <osl/file.hxx>
#include <osl/mutex.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index 3c61c5399c47..a2989cc9a19b 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -22,6 +22,7 @@
#include <rtl/bootstrap.hxx>
#include <rtl/uri.hxx>
#include <config_folders.h>
+#include <tools/stream.hxx>
#include <tools/XmlWriter.hxx>
#include <tools/XmlWalker.hxx>
#include <vcl/customweld.hxx>
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 17f2577a0afe..dcde367c383c 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -34,6 +34,7 @@
#include <comphelper/fileformat.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <tools/stream.hxx>
#include <unotools/localedatawrapper.hxx>
using namespace com::sun::star::uno;
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index dcc1f17bbe55..a19b8d2f11c2 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -28,6 +28,7 @@
#include <bitmaps.hlst>
#include <svx/dlgctrl.hxx>
#include <svx/dialmgr.hxx>
+#include <tools/debug.hxx>
#include <tools/poly.hxx>
#include <vcl/region.hxx>
#include <vcl/gradient.hxx>
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 25c17e21f5a8..9b36547ae5b1 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -36,6 +36,7 @@
#include <vcl/settings.hxx>
#include <i18nlangtag/languagetag.hxx>
+#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 75a36a4af429..225d31687097 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -54,6 +54,7 @@
#include <tools/stream.hxx>
#include <comphelper/anytostring.hxx>
#include <svx/svdpagv.hxx>
+#include <tools/debug.hxx>
#include <tools/globname.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/jobset.hxx>
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index d7b9b0f71561..46ec04c2f77b 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -64,6 +64,7 @@
#include <svx/svdomeas.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdpool.hxx>
+#include <tools/stream.hxx>
#include <tools/gen.hxx>
#include <svx/svdocapt.hxx>
#include <svx/obj3d.hxx>
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 7d5ebec8c7bf..49e589542b50 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
+#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <vcl/window.hxx>
#include <vcl/virdev.hxx>
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index dbf74df4b960..1242fcb91fc0 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -19,6 +19,7 @@
#include <editeng/formatbreakitem.hxx>
#include <sal/log.hxx>
+#include <tools/stream.hxx>
#include <doc.hxx>
#include <IDocumentStatistics.hxx>
#include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index d00013e8f4fb..0af520ef3b65 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -19,6 +19,7 @@
#include <redline.hxx>
#include <tools/datetime.hxx>
+#include <tools/lineend.hxx>
#include <svl/eitem.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index a71969f6acfb..54b674e6ed38 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -29,6 +29,7 @@
#include <fmtfld.hxx>
#include <txtfld.hxx>
#include <svl/itempool.hxx>
+#include <tools/lineend.hxx>
#include <unotools/useroptions.hxx>
#include <svl/whiter.hxx>
#include <svl/eitem.hxx>
More information about the Libreoffice-commits
mailing list