tdf#42949 Fix IWYU warnings in include/sfx2/[n-r]*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ia2bea9bd4775f4ed5ef0133971106a6c0bfdd1c0
Reviewed-on: https://gerrit.libreoffice.org/69896
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

102 files changed, 162 insertions, 66 deletions

diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 49cf31b5957b..16e73e6da2f0 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 62288ab3a756..69cce08fbfc1 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -65,6 +65,7 @@
 #include <dialmgr.hxx>
 
 #include <unotools/configmgr.hxx>
+#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/FileSystemStorageFactory.hpp>
 #include <com/sun/star/frame/UnknownModuleException.hpp>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 44951b635e88..cbea2186706e 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -22,6 +22,7 @@
 #include <unotools/pathoptions.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/window.hxx>
 #include <tools/urlobj.hxx>
diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx
index bbf3b2df3481..f3d1524eefce 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -12,6 +12,7 @@
 #include <test/unoapi_test.hxx>
 #include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 9157580e8bb7..a688350cb386 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -18,6 +18,7 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <boost/property_tree/json_parser.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <com/sun/star/frame/XStorable.hpp>
 
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index c7a974008f4b..d3c5fada8df4 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -135,6 +135,8 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <svx/EnhancedCustomShape2d.hxx>
 #include <svx/xbitmap.hxx>
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 66c4a40387ae..723145ab00c4 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -10,6 +10,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <stdarg.h>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 8a264753e28c..fa258ea7f93c 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index bdc0a9b8de99..9792fc503ee8 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -26,14 +26,17 @@
 #include <sfx2/objsh.hxx>
 
 #include <vcl/idle.hxx>
-#include <vcl/customweld.hxx>
-#include <vcl/weld.hxx>
 #include <sfx2/doctempl.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
+namespace weld { class Button; }
+namespace weld { class CheckButton; }
+namespace weld { class CustomWeld; }
+namespace weld { class Expander; }
+namespace weld { class Label; }
+namespace weld { class TreeView; }
+namespace weld { class Window; }
 
-class SfxObjectShellLock;
-class SfxObjectShell;
 class SfxPreviewWin_Impl;
 
 enum class SfxNewFileDialogMode {
diff --git a/include/sfx2/notebookbar/NotebookbarTabControl.hxx b/include/sfx2/notebookbar/NotebookbarTabControl.hxx
index f3411d769b71..68d7b4ef252d 100644
--- a/include/sfx2/notebookbar/NotebookbarTabControl.hxx
+++ b/include/sfx2/notebookbar/NotebookbarTabControl.hxx
@@ -10,14 +10,13 @@
 #ifndef INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARTABCONTROL_HXX
 #define INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARTABCONTROL_HXX
 
-#include <vcl/toolbox.hxx>
 #include <sfx2/dllapi.h>
 #include <vcl/tabctrl.hxx>
 
-class ChangedUIEventListener;
 namespace com { namespace sun { namespace star { namespace ui {
     class XUIConfigurationListener;
 } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 class SFX2_DLLPUBLIC NotebookbarTabControl final : public NotebookbarTabControlBase
 {
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index eeff0015a775..9eb76e9c3ba5 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -11,10 +11,14 @@
 #define INCLUDED_SFX2_NOTEBOOKBAR_SFXNOTEBOOKBAR_HXX
 
 #include <sfx2/dllapi.h>
-#include <sfx2/viewfrm.hxx>
-#include <vcl/notebookbar.hxx>
+#include <rtl/ustring.hxx>
+
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 class SfxBindings;
+class SfxViewFrame;
+class SystemWindow;
 
 namespace sfx2 {
 
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index bfda103a48ff..32f23200afbd 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -28,9 +28,7 @@
 #include <sfx2/toolbarids.hxx>
 
 struct SfxInterface_Impl;
-class  SfxConfigItem;
 class  SfxModule;
-class  SvStream;
 
 #define SFX_OBJECTBAR_APPLICATION       0
 #define SFX_OBJECTBAR_OBJECT            1
diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index b8d4f72ea844..5aa6b989b611 100644
--- a/include/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.hxx
@@ -23,8 +23,7 @@
 #include <sfx2/dllapi.h>
 #include <svl/poolitem.hxx>
 
-#include <sfx2/shell.hxx>
-
+class SfxShell;
 
 class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem
 {
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 4a0175776032..c44db6f90a58 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -26,61 +26,43 @@
 #include <vcl/errcode.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/security/DocumentSignatureInformation.hpp>
-#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/document/CmisVersion.hpp>
 
 #include <vcl/vclptr.hxx>
-#include <vcl/button.hxx>
 #include <svl/poolitem.hxx>
-#include <vcl/bitmap.hxx>
 #include <sot/formats.hxx>
 #include <sot/object.hxx>
-#include <svl/style.hxx>
+#include <tools/gen.hxx>
+#include <tools/link.hxx>
 
-#include <sfx2/XmlIdRegistry.hxx>
 #include <sfx2/shell.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
-#include <com/sun/star/frame/XModel.hpp>
 #include <memory>
 #include <set>
 #include <o3tl/typed_flags_set.hxx>
 #include <functional>
 
-#include <LibreOfficeKit/LibreOfficeKitTypes.h>
-
 class SbxValue;
-class SvxMacro;
 class SbxArray;
 class BasicManager;
 class SfxMedium;
 class SfxObjectFactory;
 class SfxDocumentInfoDialog;
 class SfxStyleSheetBasePool;
-class INote;
-class SfxStyleSheetPool;
-class SfxFrame;
-class SbMethod;
 class StarBASIC;
 class Printer;
 class SvKeyValueIterator;
 class SfxBaseModel;
 class SfxModule;
-class SvData;
 class SfxProgress;
 class GDIMetaFile;
-class Bitmap;
 class INetURLObject;
 class IndexBitSet;
 class JobSetup;
-class Size;
-class Point;
+class Button;
+class OutputDevice;
+class Color;
+class Fraction;
+
 enum class SfxModelFlags;
 enum class SfxEventHintId;
 
@@ -99,7 +81,17 @@ namespace sfx2
     class StyleManager;
 }
 
-namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::document { struct CmisVersion; }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::graphic { class XGraphic; }
+namespace com::sun::star::io { class XStream; }
+namespace com::sun::star::script { class XLibraryContainer; }
+namespace com::sun::star::security { class XCertificate; }
+namespace com::sun::star::security { class XDocumentDigitalSignatures; }
+namespace com::sun::star::security { struct DocumentSignatureInformation; }
+namespace com::sun::star::task { class XInteractionHandler; }
 
 namespace com { namespace sun { namespace star {
     namespace document {
@@ -113,6 +105,8 @@ namespace com { namespace sun { namespace star {
     }
 } } }
 
+namespace sfx2 { class IXmlIdRegistry; }
+
 #define SFX_TITLE_TITLE    0
 #define SFX_TITLE_FILENAME 1
 #define SFX_TITLE_FULLNAME 2
@@ -171,7 +165,6 @@ enum class SfxObjectCreateMode
     into foreign objects.
 */
 
-class SfxToolBoxConfig;
 struct TransferableObjectDescriptor;
 template<class T> bool checkSfxObjectShell(const SfxObjectShell* pShell)
 {
diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx
index ef36e01dad73..ca70b955a017 100644
--- a/include/sfx2/opengrf.hxx
+++ b/include/sfx2/opengrf.hxx
@@ -20,13 +20,15 @@
 #define INCLUDED_SFX2_OPENGRF_HXX
 
 #include <memory>
-#include <vcl/graphicfilter.hxx>
-#include <vcl/weld.hxx>
 #include <sfx2/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <vcl/errcode.hxx>
 
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
+namespace com::sun::star::ui::dialogs { class XFilePickerControlAccess; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace weld { class Window; }
 
+class Graphic;
 struct  SvxOpenGrf_Impl;
 
 class SFX2_DLLPUBLIC SvxOpenGraphicDialog
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index e9b3eef8a957..6b6248962879 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <sfx2/app.hxx>
 #include <vcl/weld.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index 4231baee4fa8..89056caae2a7 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
@@ -22,10 +22,8 @@
 #include <memory>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <sal/types.h>
 #include <vcl/print.hxx>
 
-class SfxTabPage;
 class SfxItemSet;
 
 // class SfxPrinter ------------------------------------------------------
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index cd8a43c97546..996a32e45c27 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -25,15 +25,12 @@
 #include <sal/types.h>
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/print.hxx>
 
 #include <sfx2/tabdlg.hxx>
 
 
-class SvtBasePrintOptions;
-
 class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage : public SfxTabPage
 {
 private:
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index 1408ac776a95..5e877532ef43 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -21,12 +21,13 @@
 
 #include <memory>
 #include <sal/config.h>
-#include <sfx2/dllapi.h>
-#include <sfx2/printer.hxx>
+#include <vcl/vclptr.hxx>
 #include <vcl/weld.hxx>
 
 
 class SfxViewShell;
+class SfxTabPage;
+class SfxItemSet;
 
 
 struct SfxPrintOptDlg_Impl;
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index 2a62bf6da44c..ceee49b6c5e7 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -23,16 +23,11 @@
 #include <sal/config.h>
 #include <sal/types.h>
 #include <sfx2/dllapi.h>
-#include <tools/link.hxx>
 #include <memory>
 
-namespace rtl {
-    class OUString;
-};
+
 class SfxObjectShell;
 struct SfxProgress_Impl;
-struct PlugInLoadStatus;
-struct SvProgressArg;
 
 class SFX2_DLLPUBLIC SfxProgress
 {
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 3210d47c651f..516c650d2b60 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -11,12 +11,13 @@
 #define INCLUDED_SFX2_RECENTDOCSVIEW_HXX
 
 #include <sfx2/thumbnailview.hxx>
-#include <sfx2/recentdocsviewitem.hxx>
 #include <vcl/image.hxx>
 
 #include <o3tl/typed_flags_set.hxx>
 
-#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/util/URL.hpp>
+
+namespace com::sun::star::frame { class XDispatch; }
 
 namespace sfx2
 {
diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx
index 2ee90de19f03..5f88f4170cae 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -10,7 +10,9 @@
 #ifndef INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
 #define INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
 
-#include <sfx2/thumbnailview.hxx>
+#include <sfx2/thumbnailviewitem.hxx>
+
+class ThumbnailView;
 
 namespace sfx2
 {
diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx
index 27895abc6fe7..7987bdb25323 100644
--- a/include/sfx2/request.hxx
+++ b/include/sfx2/request.hxx
@@ -24,16 +24,10 @@
 #include <sal/types.h>
 #include <svl/itemset.hxx>
 #include <svl/hint.hxx>
-#include <functional>
 
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/XDispatchRecorder.hpp>
 #include <memory>
 
 class SfxPoolItem;
-class SfxAllItemSet;
-class SfxItemSet;
 class SfxItemPool;
 class SfxShell;
 class SfxSlot;
@@ -41,6 +35,9 @@ class SfxViewFrame;
 struct SfxRequest_Impl;
 enum class SfxCallMode : sal_uInt16;
 
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::frame { class XDispatchRecorder; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 namespace vcl { class Window; }
 namespace weld { class Window; }
 
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 00a5ca7429ad..d55693b8af46 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -31,6 +31,7 @@
 #include "rangelst.hxx"
 #include <osl/mutex.hxx>
 #include <formula/types.hxx>
+#include <tools/solar.h>
 
 #include <memory>
 #include <unordered_map>
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 517e2d258f70..9dffa0d11b28 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -38,6 +38,7 @@
 #include <algorithm>
 #include <comphelper/random.hxx>
 #include <osl/diagnose.h>
+#include <basegfx/numeric/ftools.hxx>
 
 using ::std::vector;
 using namespace formula;
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index 628f779bd05c..fe9ae274c986 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -26,6 +26,8 @@
 #include <svl/itemset.hxx>
 #include <osl/diagnose.h>
 
+#include <com/sun/star/frame/XModel.hpp>
+
 #define SC_PROGRESS_CXX
 #include <progress.hxx>
 #include <document.hxx>
diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx
index 8fdb2d2342fb..bc0d085170d5 100644
--- a/sc/source/core/tool/subtotal.cxx
+++ b/sc/source/core/tool/subtotal.cxx
@@ -19,6 +19,7 @@
 
 #include <subtotal.hxx>
 #include <interpre.hxx>
+#include <cfloat>
 
 bool SubTotal::SafePlus(double& fVal1, double fVal2)
 {
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 76085738d1b6..9e3d8469b338 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -54,6 +54,7 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
 #include <cppuhelper/implbase.hxx>
 #include "xltoolbar.hxx"
 #include <oox/ole/vbaproject.hxx>
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 779f5d710ddd..4d3b12d9b123 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/sheet/XAreaLinks.hpp>
 #include <com/sun/star/sheet/XAreaLink.hpp>
 #include <com/sun/star/sheet/TableValidationVisibility.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <sfx2/objsh.hxx>
 #include <tools/urlobj.hxx>
 #include <formula/grammar.hxx>
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index f695a2d7295a..b903e4891610 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -33,6 +33,7 @@
 #include <xllink.hxx>
 #include <xltools.hxx>
 #include <sal/log.hxx>
+#include <basegfx/numeric/ftools.hxx>
 
 using namespace ::formula;
 
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index db4ec7e1bfa3..635bad45ecce 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 
 #include <sfx2/objsh.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index f275a5f4ca6f..502b8722999d 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -46,6 +46,7 @@
 #include <sal/macros.h>
 #include <sal/log.hxx>
 #include <vcl/fontcharmap.hxx>
+#include <vcl/outdev.hxx>
 #include <document.hxx>
 #include <documentimport.hxx>
 #include <docpool.hxx>
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index bd8f9bfb4888..bfd2241760b5 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -43,6 +43,7 @@
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmltokn.h>
 
+#include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/diagnose.h>
diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx
index 108df7be46dc..40b9e61ecef2 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -26,6 +26,7 @@
 #include <formulacell.hxx>
 #include <vector>
 #include <com/sun/star/container/XContainer.hpp>
+#include <com/sun/star/script/XLibraryContainer.hpp>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::RuntimeException;
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index ebd42bd9db0b..d14858c85192 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -44,6 +44,7 @@
 #include <strings.hrc>
 #include <globstr.hrc>
 
+#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index d2e00200b227..4f8512558e8b 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -61,6 +61,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/sd/qa/unit/activex-controls-tests.cxx b/sd/qa/unit/activex-controls-tests.cxx
index 692a5b8b6d5d..4903d25b04e2 100644
--- a/sd/qa/unit/activex-controls-tests.cxx
+++ b/sd/qa/unit/activex-controls-tests.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 
 
 class SdActiveXControlsTest: public SdModelTestBase
diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx
index c0b2f3514808..f163068560ef 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -14,6 +14,7 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 
 #include <comphelper/sequenceashashmap.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 20a0229b5ec2..abb132741266 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/drawing/XDrawPages.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
 
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 9d79126905df..15f1e1732254 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -32,6 +32,7 @@
 #include <sfx2/docfilt.hxx>
 #include <svl/itemset.hxx>
 
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/packages/zip/ZipFileAccess.hpp>
 #include <drawinglayer/XShapeDumper.hxx>
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 11ed552099dc..bd5fd897af63 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/new.hxx>
 #include <svtools/valueset.hxx>
 #include <tools/debug.hxx>
+#include <vcl/image.hxx>
 
 #include <strings.hrc>
 
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 009b264a033e..32f55f5a02b4 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -28,6 +28,7 @@
 #include <svtools/langtab.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxdlg.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <vcl/abstdlg.hxx>
 #include <svx/drawitem.hxx>
 #include <editeng/langitem.hxx>
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 218fe6c9d6e4..b21dd27ab9d6 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -24,6 +24,7 @@
 
 #include <sfx2/docfac.hxx>
 #include <sfx2/objface.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <svx/svxids.hrc>
 #include <svl/srchitem.hxx>
 #include <svx/srchdlg.hxx>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 0553423b5eba..b7b1482bbdfb 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -86,6 +86,7 @@
 #include <memory>
 #include <vcl/weld.hxx>
 #include <vcl/errinf.hxx>
+#include <vcl/graphicfilter.hxx>
 
 #include <vcl/GraphicNativeTransform.hxx>
 #include <vcl/GraphicNativeMetadata.hxx>
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 3d400c889974..88435a6e4d57 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -23,6 +23,7 @@
 #include <o3tl/span.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/objsh.hxx>
+#include <svl/style.hxx>
 
 #include <glob.hxx>
 #include <pres.hxx>
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
index 676d99eee571..76a8369a71b3 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
@@ -22,6 +22,8 @@
 
 #include <sdxfer.hxx>
 
+#include <vcl/bitmapex.hxx>
+
 #include <vector>
 
 class SdDrawDocument;
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 098d5566812f..13ddc3db1f5f 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <sfx2/docfac.hxx>
 #include <com/sun/star/document/XTypeDetection.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
 #include <unotools/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/linkmgr.hxx>
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index bff6d3d32eea..1469b0b3fc97 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -40,6 +40,7 @@
 #include <vcl/transfer.hxx>
 #include <sot/formats.hxx>
 #include <vcl/button.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 7f4d919546a3..3767e57d768d 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -26,6 +26,8 @@
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
 
 #include <comphelper/sequenceashashmap.hxx>
 
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index a318dc875f0f..d074138ce56a 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -45,6 +45,7 @@
 
 #include <com/sun/star/script/Converter.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 9a7c02c206d7..1a0acba533eb 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -21,6 +21,7 @@
 #include <comphelper/base64.hxx>
 #include <sax/tools/converter.hxx>
 #include <sfx2/recentdocsview.hxx>
+#include <sfx2/recentdocsviewitem.hxx>
 #include <sfx2/templatelocalview.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 9bd17f6309b3..5e411b37fb82 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyContainer.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTimeWithTimezone.hpp>
diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx
index 3896f624fa49..d0515007b296 100644
--- a/sfx2/source/dialog/documentfontsdialog.cxx
+++ b/sfx2/source/dialog/documentfontsdialog.cxx
@@ -21,6 +21,8 @@
 
 #include <sfx2/objsh.hxx>
 
+#include <com/sun/star/beans/XPropertySet.hpp>
+
 using namespace ::com::sun::star;
 
 VclPtr<SfxTabPage> SfxDocumentFontsPage::Create(TabPageParent pParent, const SfxItemSet* set)
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 6c30efc09bdb..361e66f688b3 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -61,6 +61,7 @@
 #include <vcl/cvtgrf.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/saveopt.hxx>
 #include <unotools/securityoptions.hxx>
diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
index 65fb4a6472dc..8e907b7602fc 100644
--- a/sfx2/source/doc/objitem.cxx
+++ b/sfx2/source/doc/objitem.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/objitem.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 
 #include <tools/globname.hxx>
 
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index 42d02284f100..7edb7dc777b7 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/io/XStream.hpp>
 
diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
index 43421fdd9bd7..20c37dc1a297 100644
--- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx
+++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/builderfactory.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/notebookbar.hxx>
 #include <vcl/tabpage.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/notebookbar/NotebookbarTabControl.hxx>
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 68a9e7797d26..222e0f2f7e6f 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -25,6 +25,7 @@
 #include <officecfg/Office/UI/ToolbarMode.hxx>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <unotools/confignode.hxx>
 #include <comphelper/types.hxx>
 
diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx
index db94f56a9b44..492f5819f5d8 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -14,6 +14,8 @@
 #include <iterator>
 
 #include <com/sun/star/beans/XPropertyContainer.hpp>
+#include <com/sun/star/beans/Property.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index fcbf0d9bf9f5..7bedde6eb23e 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -39,6 +39,7 @@
 #include <sfx2/viewsh.hxx>
 #include "viewimp.hxx"
 #include <sfx2/viewfrm.hxx>
+#include <sfx2/printer.hxx>
 #include <sfx2/prnmon.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/request.hxx>
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index d3ac96e06a9f..6cc6b809c348 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/ui/XUIElement.hpp>
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 25c5c67d86e9..c8f41b1a8da4 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -23,6 +23,7 @@
 #include <svx/fmmodel.hxx>
 
 #include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/TerminationVetoException.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
index a0a2b899375b..1adc5fdb0b17 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
@@ -26,6 +26,8 @@
 #include <sfx2/dispatch.hxx>
 #include <avmedia/MediaControlBase.hxx>
 
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+
 using namespace avmedia;
 
 namespace svx { namespace sidebar {
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 484ca84192d4..4a4e37f41cbc 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -32,6 +32,8 @@
 #include <svtools/unitconv.hxx>
 #include <sal/log.hxx>
 
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+
 using namespace css;
 using namespace css::uno;
 
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 1adfef5f48b4..8e74f3fdcd04 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -15,6 +15,7 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/style/BreakType.hpp>
diff --git a/sw/qa/extras/unowriter/unowriter.cxx b/sw/qa/extras/unowriter/unowriter.cxx
index 8dd98ac984e9..361a608df78b 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -16,6 +16,7 @@
 #include <com/sun/star/rdf/URIs.hpp>
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/awt/XToolkit.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 #include <comphelper/propertyvalue.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx
index 41b4d34a5edf..93c3d88ca8ae 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -11,6 +11,7 @@
 
 #include <com/sun/star/text/XTextColumns.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 #include <ndtxt.hxx>
 #include <viscrs.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 6861423c5e37..da8200e39844 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/document/XLinkTargetSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <swurl.hxx>
+#include <vcl/keycodes.hxx>
 #include <vcl/svapp.hxx>
 #include <ndtxt.hxx>
 #include <txtinet.hxx>
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index e13ed035cbc1..4248784bb983 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -60,6 +60,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <pagepreviewlayout.hxx>
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index a1c2ec85906c..b2c8d0e7cf96 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -29,6 +29,7 @@
 
 #include <vcl/imap.hxx>
 #include <vcl/imapobj.hxx>
+#include <vcl/keycodes.hxx>
 
 #include <accmap.hxx>
 
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 0ad4588118bc..87f51c3ffd5b 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -33,6 +33,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <sfx2/XmlIdRegistry.hxx>
 #include <sal/log.hxx>
 
 #include <svl/macitem.hxx>
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 79e8930e39ec..ca6af57ed6e3 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -21,6 +21,8 @@
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
+#include <com/sun/star/frame/XModel.hpp>
+
 #include <editsh.hxx>
 #include <fesh.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index af17beb63f07..b5aa656dc7c3 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -19,6 +19,10 @@
 
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/ElementExistException.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/file.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 1f59982bb6f2..1299cbc1c90e 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -26,6 +26,7 @@
 #include <unotools/streamwrap.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 79de6f34239e..3db189edcce0 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <EnhancedPDFExportHelper.hxx>
 #include <hintids.hxx>
 
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index c909871b4dba..3252141d8692 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/text/RubyPosition.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 
 #include <cmdid.h>
 #include <com/sun/star/uno/Any.h>
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 22533e21689a..85db6dbcca90 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart2/data/LabelOrigin.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 63984f210c75..c3be78ddf981 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <o3tl/any.hxx>
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 5de46ad10f6c..4cff1e47f00a 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -21,6 +21,7 @@
 #include <hintids.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
+#include <sfx2/printer.hxx>
 #include <sfx2/prnmon.hxx>
 #include <svl/languageoptions.hxx>
 #include <editeng/paperinf.hxx>
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index b5103399c03a..9750ff7f07a0 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -34,6 +34,8 @@
 
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/script/XLibraryContainer.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
 
 #include <fmtornt.hxx>
 #include <fmtfld.hxx>
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index e72ab61f2a8d..3ff39a940422 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <svx/svxids.hrc>
 #include <hintids.hxx>
 #include <tools/fract.hxx>
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 88c6cabe2bd0..5407ee03a383 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/awt/XTextLayoutConstrains.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <hintids.hxx>
 #include <o3tl/any.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index dc902a9b93ef..59b8961549e9 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -8,6 +8,7 @@
  */
 
 #include "docxsdrexport.hxx"
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/xml/sax/XSAXSerializable.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 727ebc4aee62..dea7b0209bca 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -17,6 +17,8 @@
 
 #include <boost/optional.hpp>
 
+#include <com/sun/star/beans/XPropertySet.hpp>
+
 using namespace com::sun::star;
 using namespace oox;
 
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 19e39207d1f3..494c26c2dafa 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -24,6 +24,8 @@
 #include "rtfattributeoutput.hxx"
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <docsh.hxx>
 #include <viewsh.hxx>
 #include <viewopt.hxx>
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 9684964386da..4a22b3ca99b3 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -37,6 +37,9 @@
 #include <algorithm>
 #include "rtfexport.hxx"
 
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+
 using namespace css;
 
 RtfSdrExport::RtfSdrExport(RtfExport& rExport)
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 6acb64460245..bd32d7db8864 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -24,6 +24,7 @@
 
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 
 #include <i18nlangtag/languagetag.hxx>
 
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index cbf244180976..f01ce84a036d 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <officecfg/Office/Common.hxx>
 #include <o3tl/any.hxx>
 #include <vcl/errinf.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 495cd765aaa3..d69749c59718 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
 #include <com/sun/star/document/XExporter.hpp>
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 373c787e4da5..f94aef325372 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -41,6 +41,7 @@
 #include <globals.hrc>
 #include <swabstdlg.hxx>
 
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <memory>
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index c1a8efb6b4ac..b3425050f45a 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -43,6 +43,7 @@
 
 #include <globals.hrc>
 
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 053209651f01..4ad1527207cb 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -112,6 +112,7 @@
 #include <swslots.hxx>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 
+#include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index 0074dcad2e7e..44dab6ae265e 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_NUMPARA_HXX
 
 #include <sfx2/tabdlg.hxx>
+#include <svl/style.hxx>
 
 // with this TabPage numbering settings at the paragraph / paragraph style
 // are performed.
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index f0a3cc3d31b0..9d9af70695fa 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -31,6 +31,8 @@
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
 #include <com/sun/star/form/FormButtonType.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <sfx2/htmlmode.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index ef583b7c8341..768efcb4db2b 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/i18n/TextConversionOption.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/propertysequence.hxx>
 #include <swtypes.hxx>
 #include <view.hxx>
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index c3b6f751bfb7..d927967faad9 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -35,6 +35,8 @@
 #include <uitool.hxx>
 #include <cmdid.h>
 
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+
 namespace sw { namespace sidebar{
 
 VclPtr<vcl::Window> PageFooterPanel::Create(
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index e533fd25fbee..97754775ab3d 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -40,6 +40,8 @@
 #include <svtools/unitconv.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
 
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+
 namespace sw { namespace sidebar{
 
 VclPtr<vcl::Window> PageFormatPanel::Create(
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
index 7bd73b01cdd1..c2fa36888d8f 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
@@ -35,6 +35,8 @@
 #include <uitool.hxx>
 #include <cmdid.h>
 
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+
 namespace sw { namespace sidebar{
 
 VclPtr<vcl::Window> PageHeaderPanel::Create(
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index 3126db4f1ed9..e55712fdbe18 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -28,6 +28,7 @@
 #include <sfx2/objsh.hxx>
 
 #include <com/sun/star/frame/DocumentTemplates.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 #include <sfx2/doctempl.hxx>
 
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index f0c895db0de6..84883940a290 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -26,6 +26,7 @@
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objsh.hxx>
 
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 #include <editeng/fontitem.hxx>
 #include <editeng/boxitem.hxx>
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 19562ec3382a..9f5af5930f35 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/container/ElementExistException.hpp>
 #include <osl/diagnose.h>
 #include <rtl/character.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/uibase/wrtsh/navmgr.cxx b/sw/source/uibase/wrtsh/navmgr.cxx
index 021c6be512b3..dd107ed6886a 100644
--- a/sw/source/uibase/wrtsh/navmgr.cxx
+++ b/sw/source/uibase/wrtsh/navmgr.cxx
@@ -17,6 +17,7 @@
 #include <unocrsr.hxx>
 
 #include <com/sun/star/frame/XLayoutManager.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 // This method positions the cursor to the position rPos.