tdf#42949 Fix IWYU warnings in sfx2/*/*hxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I56e4b5a44143ea15660cfa293e156036952dfe8f
Reviewed-on: https://gerrit.libreoffice.org/84030
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml
index 7a26362..7f55401 100644
--- a/sfx2/IwyuFilter_sfx2.yaml
+++ b/sfx2/IwyuFilter_sfx2.yaml
@@ -1,6 +1,9 @@
---
assumeFilename: sfx2/source/appl/app.cxx
blacklist:
sfx2/source/doc/syspathw32.hxx:
# Needed on WIN32
- sal/types.h
sfx2/source/appl/appdde.cxx:
# Needed on WIN32
- config_features.h
diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx
index d302847..085283d 100644
--- a/sfx2/inc/SfxRedactionHelper.hxx
+++ b/sfx2/inc/SfxRedactionHelper.hxx
@@ -13,7 +13,6 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <sal/types.h>
diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
index e1fa57a..50b96d6 100644
--- a/sfx2/inc/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -12,13 +12,9 @@
#include <memory>
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sfx2/basedlgs.hxx>
#include <sfx2/objsh.hxx>
#include <vcl/idle.hxx>
#include <o3tl/typed_flags_set.hxx>
namespace weld
{
class Button;
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index e9c39b8..3573e9c 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -19,6 +19,8 @@
#ifndef INCLUDED_SFX2_INC_BITSET_HXX
#define INCLUDED_SFX2_INC_BITSET_HXX
#include <sal/types.h>
#include <memory>
class IndexBitSet
diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx
index 9cefc3f..c95bccf 100644
--- a/sfx2/inc/bluthsndapi.hxx
+++ b/sfx2/inc/bluthsndapi.hxx
@@ -11,9 +11,6 @@
#define INCLUDED_SFX2_INC_BLUTHSNDAPI_HXX
#include <com/sun/star/frame/XFrame.hpp>
#include <rtl/ustring.hxx>
#include <tools/link.hxx>
#include <sfx2/dllapi.h>
#include <sfx2/mailmodelapi.hxx>
diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx
index bb37cab..bd1aa5a 100644
--- a/sfx2/inc/fwkhelper.hxx
+++ b/sfx2/inc/fwkhelper.hxx
@@ -21,12 +21,9 @@
#define INCLUDED_SFX2_INC_FWKHELPER_HXX
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/frame/XFrame.hpp>
#include <rtl/ustring.hxx>
void RefreshToolbars(
css::uno::Reference< css::frame::XFrame > const & rFrame
);
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index 5e73557..e8ccacf 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -22,7 +22,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XContainerQuery.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 9843dec..53acd96 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -22,7 +22,6 @@
#include <rtl/ustring.hxx>
#include <sfx2/tbxctrl.hxx>
#include <svtools/acceleratorexecute.hxx>
#include <vcl/combobox.hxx>
class SvtURLBox;
diff --git a/sfx2/inc/preventduplicateinteraction.hxx b/sfx2/inc/preventduplicateinteraction.hxx
index 1f96e8f..9268083 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/TerminationVetoException.hpp>
#include <com/sun/star/frame/XTerminateListener2.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/task/XInteractionHandler2.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
@@ -32,7 +31,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
#include <sfx2/app.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
diff --git a/sfx2/inc/sfxbasecontroller_internal.hxx b/sfx2/inc/sfxbasecontroller_internal.hxx
index 5b382f0..2f59341 100644
--- a/sfx2/inc/sfxbasecontroller_internal.hxx
+++ b/sfx2/inc/sfxbasecontroller_internal.hxx
@@ -10,6 +10,8 @@
#ifndef INCLUDED_SFX2_INC_SFXBASECONTROLLER_INTERNAL_HXX
#define INCLUDED_SFX2_INC_SFXBASECONTROLLER_INTERNAL_HXX
#include <sal/types.h>
extern sal_uInt32 Get10ThSec();
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index 0b74509..4767dc2 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SFX2_INC_SRCHDLG_HXX
#define INCLUDED_SFX2_INC_SRCHDLG_HXX
#include <sfx2/basedlgs.hxx>
#include <vcl/weld.hxx>
namespace sfx2 {
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 33750b9..172f6e2 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -20,6 +20,7 @@
#include <config_feature_desktop.h>
#include <sal/log.hxx>
#include <osl/module.hxx>
#include <tools/debug.hxx>
#include <sfx2/app.hxx>
#include <sfx2/frame.hxx>
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index 05a0f18..0a2fa0b 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -18,8 +18,10 @@
*/
#include <osl/diagnose.h>
#include <svl/whiter.hxx>
#include <svl/eitem.hxx>
#include <tools/debug.hxx>
#include <sfx2/app.hxx>
#include <appdata.hxx>
@@ -33,6 +35,7 @@
#include <sfxtypes.hxx>
#include <sfx2/module.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/viewfrm.hxx>
void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, std::unique_ptr<SfxChildWinFactory> pFact )
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 5f6fb65..0c8200e6 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -59,6 +59,7 @@
#include <svl/urihelper.hxx>
#include <unotools/localfilehelper.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/securityoptions.hxx>
#include <unotools/moduleoptions.hxx>
#include <svtools/miscopt.hxx>
#include <osl/file.hxx>
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 602b249..89aa5bb 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -27,7 +27,9 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <comphelper/string.hxx>
#include <cppuhelper/implbase.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/childwin.hxx>
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index c6cb021..8d66ced 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -28,8 +28,8 @@
#include <com/sun/star/frame/XStatusListener.hpp>
#include <tools/link.hxx>
#include <vcl/vclptr.hxx>
#include "newhelp.hxx"
#include <vector>
#include <memory>
class SfxHelpWindow_Impl;
class HelpInterceptor_Impl : public ::cppu::WeakImplHelper<
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 2613935..7e0dcbc 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -94,6 +94,7 @@
#include <vcl/unohelp.hxx>
#include <vcl/i18nhelp.hxx>
#include <vcl/layout.hxx>
#include <vcl/taskpanelist.hxx>
#include <vcl/settings.hxx>
#include <vcl/weld.hxx>
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index c6cf38d..5bcffa2 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -33,7 +33,6 @@
#include <vcl/lstbox.hxx>
#include <vcl/weld.hxx>
#include <vcl/treelistbox.hxx>
#include <unotools/moduleoptions.hxx>
#include <srchdlg.hxx>
diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx
index a103603..0761c25 100644
--- a/sfx2/source/appl/panelist.hxx
+++ b/sfx2/source/appl/panelist.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SFX2_SOURCE_APPL_PANELIST_HXX
#define INCLUDED_SFX2_SOURCE_APPL_PANELIST_HXX
#include <vcl/taskpanelist.hxx>
#include <vcl/keycod.hxx>
namespace sfx2
{
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index a6d8fca..f50e776 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -22,17 +22,13 @@
#include <com/sun/star/frame/XTerminateListener.hpp>
#include <com/sun/star/frame/XDesktop2.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <osl/mutex.hxx>
#include <sfx2/sfxuno.hxx>
#include <cppuhelper/compbase.hxx>
#include <sfx2/dllapi.h>
#include <tools/link.hxx>
#include <memory>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 349302f..c191995 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -72,6 +72,7 @@
#include <sfx2/sfxhelp.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfxtypes.hxx>
#include <sfx2/sfxuno.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index 25b401e..c570e7c 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/document/FilterConfigRefresh.hpp>
#include <comphelper/processfactory.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/sfxuno.hxx>
#include <sfx2/docfac.hxx>
diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index 29f0c3b..69dbaf5 100644
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.hxx
@@ -20,14 +20,10 @@
#ifndef INCLUDED_SFX2_SOURCE_BASTYP_FLTLST_HXX
#define INCLUDED_SFX2_SOURCE_BASTYP_FLTLST_HXX
#include <sfx2/fcontnr.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/util/XRefreshable.hpp>
#include <com/sun/star/util/XRefreshListener.hpp>
#include <com/sun/star/document/XEventListener.hpp>
#include <com/sun/star/lang/EventObject.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
class SfxFilterListener final
{
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index ec29424..9cf183c 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -26,6 +26,7 @@
#include <svl/eitem.hxx>
#include <tools/time.hxx>
#include <tools/debug.hxx>
#include <sal/log.hxx>
#include <appdata.hxx>
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index 4d3f0d7..c4d10e5 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -31,7 +31,6 @@
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <vcl/vclptr.hxx>
#include <vector>
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 1eef382..91b333a 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -35,6 +35,7 @@
#include <svtools/langhelp.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/templatecontaineritem.hxx>
#include <sfx2/templateviewitem.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/menubtn.hxx>
@@ -48,6 +49,7 @@
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/document/UpdateDocMode.hpp>
#include <com/sun/star/frame/Desktop.hpp>
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index a4a5803..c9a803e 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -30,19 +30,15 @@
#include <sfx2/recentdocsview.hxx>
#include <sfx2/templatedefaultview.hxx>
#include <sfx2/templatelocalview.hxx>
#include <sfx2/templateviewitem.hxx>
#include <svtools/acceleratorexecute.hxx>
#include <unotools/moduleoptions.hxx>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <memory>
#include <set>
class ToolBox;
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index ff2e65a21..d1ad914 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -25,8 +25,10 @@
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
#include <osl/diagnose.h>
#include <rtl/instance.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/propertysequence.hxx>
@@ -42,6 +44,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/msgpool.hxx>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/awt/XWindow.hpp>
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index cdc8189..c0ddb55 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -25,7 +25,6 @@
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp>
#include <sfx2/fcontnr.hxx>
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index c3a5505..6e561a3 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -25,6 +25,7 @@
#include <unotools/viewoptions.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <vcl/event.hxx>
#include <vcl/menu.hxx>
diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx b/sfx2/source/doc/SfxRedactionHelper.cxx
index cdbc91f..5750357 100644
--- a/sfx2/source/doc/SfxRedactionHelper.cxx
+++ b/sfx2/source/doc/SfxRedactionHelper.cxx
@@ -10,6 +10,7 @@
#include <SfxRedactionHelper.hxx>
#include <autoredactdialog.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index d14b2af..0074eb7 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -30,6 +30,7 @@
#include <tools/debug.hxx>
#include <comphelper/string.hxx>
#include <sot/storage.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/dibtools.hxx>
#include "oleprops.hxx"
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index 42770bc..1da7110 100644
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase.hxx>
#include <vector>
diff --git a/sfx2/source/doc/exoticfileloadexception.hxx b/sfx2/source/doc/exoticfileloadexception.hxx
index 3f8d480..99cb542 100644
--- a/sfx2/source/doc/exoticfileloadexception.hxx
+++ b/sfx2/source/doc/exoticfileloadexception.hxx
@@ -10,7 +10,8 @@
#ifndef INCLUDED_SFX2_EXOTICFILELOADEXCEPTION_HXX
#define INCLUDED_SFX2_EXOTICFILELOADEXCEPTION_HXX
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionContinuation.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
#include <cppuhelper/implbase.hxx>
class ExoticFileLoadException : public cppu::WeakImplHelper<css::task::XInteractionRequest>
diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx
index dd2e921..3f6f66d 100644
--- a/sfx2/source/doc/graphhelp.hxx
+++ b/sfx2/source/doc/graphhelp.hxx
@@ -23,6 +23,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/io/XStream.hpp>
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
class SvMemoryStream;
class GDIMetaFile;
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 64d9e17..4333b02 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -29,6 +29,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <sal/log.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/sfx2/source/doc/objstor.hxx b/sfx2/source/doc/objstor.hxx
index ea689f0..d4b8683 100644
--- a/sfx2/source/doc/objstor.hxx
+++ b/sfx2/source/doc/objstor.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SFX2_SOURCE_DOC_OBJSTOR_HXX
#define INCLUDED_SFX2_SOURCE_DOC_OBJSTOR_HXX
#include <com/sun/star/frame/XModel.hpp>
void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& xModel);
#endif // INCLUDED_SFX2_SOURCE_DOC_OBJSTOR_HXX
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index e5cb4cf..b9b7426 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -25,7 +25,6 @@
#include <osl/thread.h>
#include <rtl/ustring.hxx>
#include <sot/storage.hxx>
#include <vcl/bitmapex.hxx>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/Date.hpp>
diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx
index f56ae93..b1f12c9 100644
--- a/sfx2/source/doc/printhelper.hxx
+++ b/sfx2/source/doc/printhelper.hxx
@@ -22,7 +22,6 @@
#include <memory>
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sfx2/viewsh.hxx>
#include <sal/types.h>
diff --git a/sfx2/source/doc/syspath.hxx b/sfx2/source/doc/syspath.hxx
index d355a3e..7837b03 100644
--- a/sfx2/source/doc/syspath.hxx
+++ b/sfx2/source/doc/syspath.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SFX2_SOURCE_DOC_SYSPATH_HXX
#define INCLUDED_SFX2_SOURCE_DOC_SYSPATH_HXX
#include <sfx2/dllapi.h>
#include <sal/types.h>
namespace SystemPath
{
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index b38779d..b22c59a 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -23,10 +23,8 @@
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <svl/lstner.hxx>
#include <svl/svdde.hxx>
#include <svtools/ehdl.hxx>
#include <vcl/timer.hxx>
#include <sfx2/app.hxx>
#include <o3tl/enumarray.hxx>
diff --git a/sfx2/source/inc/appopen.hxx b/sfx2/source/inc/appopen.hxx
index a6f20e8..858f14e 100644
--- a/sfx2/source/inc/appopen.hxx
+++ b/sfx2/source/inc/appopen.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SFX2_SOURCE_INC_APPOPEN_HXX
#include <sal/config.h>
#include <sal/types.h>
#include <vcl/errcode.hxx>
class SfxItemPool;
class SfxMedium;
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index be64214..b6d63a0 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -22,21 +22,13 @@
#include <sal/types.h>
#include <com/sun/star/document/DocumentEvent.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/document/XEventListener.hpp>
#include <com/sun/star/document/XEventBroadcaster.hpp>
#include <com/sun/star/document/XDocumentEventListener.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/task/XJobExecutor.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Type.hxx>
#include <cppuhelper/implbase.hxx>
#include <sfx2/sfxuno.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <svl/lstner.hxx>
#include <unotools/eventcfg.hxx>
namespace comphelper
{
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 3d7215a..6abb5a4 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -19,9 +19,7 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_HELPER_HXX
#define INCLUDED_SFX2_SOURCE_INC_HELPER_HXX
#include <com/sun/star/ucb/NameClash.hpp>
#include <rtl/ustring.hxx>
#include <vcl/errcode.hxx>
#include <vector>
diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx
index 9e1dfba..051486c 100644
--- a/sfx2/source/inc/macroloader.hxx
+++ b/sfx2/source/inc/macroloader.hxx
@@ -31,13 +31,10 @@
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
#include <com/sun/star/frame/XDispatchResultListener.hpp>
#include <com/sun/star/frame/XSynchronousDispatch.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/util/URL.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <sfx2/sfxuno.hxx>
#include <vcl/errcode.hxx>
class SfxObjectShell;
diff --git a/sfx2/source/inc/nochaos.hxx b/sfx2/source/inc/nochaos.hxx
index a9b5c80..5468eee 100644
--- a/sfx2/source/inc/nochaos.hxx
+++ b/sfx2/source/inc/nochaos.hxx
@@ -19,6 +19,8 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_NOCHAOS_HXX
#define INCLUDED_SFX2_SOURCE_INC_NOCHAOS_HXX
#include <sal/types.h>
class SfxItemPool;
class NoChaos
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index d52ee83..0492e26 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -24,7 +24,6 @@
#include <rtl/ref.hxx>
#include <tools/datetime.hxx>
#include <unotools/securityoptions.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/docmacromode.hxx>
#include <bitset.hxx>
diff --git a/sfx2/source/inc/openuriexternally.hxx b/sfx2/source/inc/openuriexternally.hxx
index b45b2b7..df25285 100644
--- a/sfx2/source/inc/openuriexternally.hxx
+++ b/sfx2/source/inc/openuriexternally.hxx
@@ -12,6 +12,8 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
namespace sfx2
{
/** Open a URI via com.sun.star.system.SystemShellExecute
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index a1fe235..89dfa55 100644
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_PREVIEW_HXX
#define INCLUDED_SFX2_SOURCE_INC_PREVIEW_HXX
#include <tools/link.hxx>
#include <vcl/customweld.hxx>
class SfxObjectShell;
diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx
index 0a7476d..1d5b26b 100644
--- a/sfx2/source/inc/sfxurlrelocator.hxx
+++ b/sfx2/source/inc/sfxurlrelocator.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_SFXURLRELOCATOR_HXX
#define INCLUDED_SFX2_SOURCE_INC_SFXURLRELOCATOR_HXX
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XOfficeInstallationDirectories.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
diff --git a/sfx2/source/inc/slotserv.hxx b/sfx2/source/inc/slotserv.hxx
index 3156474..e5bd07dc 100644
--- a/sfx2/source/inc/slotserv.hxx
+++ b/sfx2/source/inc/slotserv.hxx
@@ -19,6 +19,8 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_SLOTSERV_HXX
#define INCLUDED_SFX2_SOURCE_INC_SLOTSERV_HXX
#include <sal/types.h>
class SfxSlot;
class SfxSlotServer
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index 34d26e3..5c861e2 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -21,6 +21,7 @@
#include <vcl/splitwin.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/dockwin.hxx>
#include <vector>
#include <memory>
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 1981bb2..59e6d72 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -37,6 +37,7 @@ class SfxTemplateControllerItem;
#include <svl/style.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/styfitem.hxx>
#include <sfx2/templdlg.hxx>
diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx
index 50572d7..9b13f8c 100644
--- a/sfx2/source/inc/tplcitem.hxx
+++ b/sfx2/source/inc/tplcitem.hxx
@@ -22,6 +22,7 @@
#include <sfx2/ctrlitem.hxx>
#include <tools/link.hxx>
struct ImplSVEvent;
class SfxCommonTemplateDialog_Impl;
class SfxTemplateControllerItem : public SfxControllerItem {
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 35cd9dd..9eb1d98 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -20,25 +20,20 @@
#define INCLUDED_SFX2_SOURCE_INC_WORKWIN_HXX
#include <vector>
#include <deque>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/ui/XUIElement.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/frame/XLayoutManagerListener.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/weakref.hxx>
#include <rtl/ustring.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/shell.hxx>
#include <sfx2/ctrlitem.hxx>
#include <sfx2/toolbarids.hxx>
#include <sfx2/viewfrm.hxx>
class SfxSplitWindow;
class SfxWorkWindow;
diff --git a/sfx2/source/notebookbar/DropdownBox.hxx b/sfx2/source/notebookbar/DropdownBox.hxx
index 0fd1b68..d66d798 100644
--- a/sfx2/source/notebookbar/DropdownBox.hxx
+++ b/sfx2/source/notebookbar/DropdownBox.hxx
@@ -20,14 +20,8 @@
#ifndef INCLUDED_SFX2_NOTEBOOKBAR_DROPDOWNBOX_HXX
#define INCLUDED_SFX2_NOTEBOOKBAR_DROPDOWNBOX_HXX
#include <vcl/builderfactory.hxx>
#include <vcl/IPrioritable.hxx>
#include <vcl/layout.hxx>
#include <sfx2/dllapi.h>
#include <sfx2/viewfrm.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/toolbox.hxx>
#include <sfx2/tbxctrl.hxx>
#include "NotebookbarPopup.hxx"
class DropdownBox : public VclHBox, public vcl::IPrioritable
diff --git a/sfx2/source/notebookbar/NotebookbarPopup.hxx b/sfx2/source/notebookbar/NotebookbarPopup.hxx
index 5ac1377..c417a75 100644
--- a/sfx2/source/notebookbar/NotebookbarPopup.hxx
+++ b/sfx2/source/notebookbar/NotebookbarPopup.hxx
@@ -21,8 +21,6 @@
#define INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARPOPUP_HXX
#include <vcl/layout.hxx>
#include <sfx2/dllapi.h>
#include <sfx2/viewfrm.hxx>
#include <vcl/floatwin.hxx>
/*
diff --git a/sfx2/source/notebookbar/PriorityHBox.hxx b/sfx2/source/notebookbar/PriorityHBox.hxx
index 4c5bbc7..04b884d 100644
--- a/sfx2/source/notebookbar/PriorityHBox.hxx
+++ b/sfx2/source/notebookbar/PriorityHBox.hxx
@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <vcl/builderfactory.hxx>
#include <vcl/IPrioritable.hxx>
#include <vcl/layout.hxx>
#include <sfx2/dllapi.h>
#include <sfx2/viewfrm.hxx>
#include "DropdownBox.hxx"
#include <vector>
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 9cee64b..b7d832a 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/awt/XTopWindow.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/util/XCloseable.hpp>
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index dd894c8..6fba3d1 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -32,6 +32,8 @@
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/sfxuno.hxx>
#include <sfx2/viewsh.hxx>
#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 79ab640..b98d917 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -23,15 +23,8 @@
#include <sfx2/frame.hxx>
#include <sfx2/viewfrm.hxx>
class SfxViewFrame;
#include <com/sun/star/awt/XTopWindow.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/PosSize.hpp>
#include <cppuhelper/weak.hxx>
#include <tools/svborder.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/sfxuno.hxx>
#include <vcl/window.hxx>
class SfxFrame_Impl : public SfxBroadcaster
{
diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx
index 568c279..18675d4 100644
--- a/sfx2/source/view/impviewframe.hxx
+++ b/sfx2/source/view/impviewframe.hxx
@@ -22,12 +22,9 @@
#include <sfx2/viewfrm.hxx>
#include <svtools/asynclink.hxx>
#include <tools/svborder.hxx>
#include <vcl/window.hxx>
#include <o3tl/optional.hxx>
struct SfxViewFrame_Impl
{
SvBorder aBorder;
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 998ae24..ea73e08 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -62,6 +62,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <toolkit/helper/convert.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/fract.hxx>
#include <tools/gen.hxx>
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index e2100e3..dc2c696 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/awt/KeyModifier.hpp>
#include <com/sun/star/awt/MouseEvent.hpp>
#include <com/sun/star/awt/MouseButton.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/util/XCloseBroadcaster.hpp>
#include <com/sun/star/util/XCloseListener.hpp>
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 7d62ef0..8c29f04 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -35,6 +35,7 @@
#include <sfx2/sfxsids.hrc>
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/util/CloseVetoException.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/embed/VerbDescriptor.hpp>
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 756b7bc..7046483 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -21,16 +21,12 @@
#define INCLUDED_SFX2_SOURCE_VIEW_VIEWIMP_HXX
#include <memory>
#include <basic/sbxobj.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/viewfrm.hxx>
#include <osl/mutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <svtools/acceleratorexecute.hxx>
#include <rtl/ref.hxx>
#include <vcl/print.hxx>
#include <queue>
#include <vector>
class SfxBaseController;
