[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source extensions/source filter/source fpicker/source framework/inc framework/source include/IwyuFilter_include.yaml include/sfx2 include/svtools include/svx reportdesign/source sc/source sd/source sfx2/source svtools/inc svtools/source svx/source sw/qa sw/source xmlsecurity/IwyuFilter_xmlsecurity.yaml xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Feb 5 08:15:57 UTC 2019
basctl/source/basicide/baside2.hxx | 1
chart2/source/controller/main/ElementSelector.hxx | 1
cui/source/dialogs/FontFeaturesDialog.cxx | 1
cui/source/tabpages/grfpage.cxx | 1
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 1
dbaccess/source/ui/app/AppSwapWindow.cxx | 1
dbaccess/source/ui/app/AppView.cxx | 1
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 1
dbaccess/source/ui/control/TableGrantCtrl.cxx | 1
dbaccess/source/ui/control/sqledit.cxx | 1
dbaccess/source/ui/dlg/indexdialog.cxx | 1
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 1
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 1
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 1
dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 1
dbaccess/source/ui/tabledesign/TEditControl.cxx | 1
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 1
dbaccess/source/ui/uno/composerdialogs.cxx | 2
dbaccess/source/ui/uno/unosqlmessage.cxx | 2
extensions/source/abpilot/unodialogabp.cxx | 3
extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 2
extensions/source/propctrlr/controlfontdialog.cxx | 1
extensions/source/propctrlr/pcrunodialogs.cxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 1
extensions/source/propctrlr/usercontrol.cxx | 1
filter/source/graphic/GraphicExportFilter.cxx | 1
fpicker/source/office/OfficeControlAccess.cxx | 1
fpicker/source/office/RemoteFilesDialog.cxx | 5
framework/inc/uielement/generictoolbarcontroller.hxx | 1
framework/source/loadenv/loadenv.cxx | 1
framework/source/uielement/complextoolbarcontroller.cxx | 1
framework/source/uielement/controlmenucontroller.cxx | 2
framework/source/uielement/fontmenucontroller.cxx | 1
framework/source/uielement/fontsizemenucontroller.cxx | 1
framework/source/uielement/genericstatusbarcontroller.cxx | 1
framework/source/uielement/langselectionmenucontroller.cxx | 1
framework/source/uielement/langselectionstatusbarcontroller.cxx | 1
framework/source/uielement/newmenucontroller.cxx | 2
framework/source/uielement/popuptoolbarcontroller.cxx | 1
framework/source/uielement/recentfilesmenucontroller.cxx | 1
framework/source/uielement/statusbarmanager.cxx | 1
framework/source/uielement/styletoolbarcontroller.cxx | 2
framework/source/uielement/subtoolbarcontroller.cxx | 1
framework/source/uielement/thesaurusmenucontroller.cxx | 1
framework/source/uielement/toolbarmodemenucontroller.cxx | 1
framework/source/uielement/toolbarsmenucontroller.cxx | 1
include/IwyuFilter_include.yaml | 61 ++++++++++
include/sfx2/sfxhtml.hxx | 1
include/svtools/DocumentInfoPreview.hxx | 4
include/svtools/DocumentToGraphicRenderer.hxx | 10 -
include/svtools/PlaceEditDialog.hxx | 11 -
include/svtools/ServerDetailsControls.hxx | 19 ++-
include/svtools/acceleratorexecute.hxx | 18 +-
include/svtools/accessibilityoptions.hxx | 1
include/svtools/accessibleruler.hxx | 15 --
include/svtools/addresstemplate.hxx | 15 --
include/svtools/asynclink.hxx | 2
include/svtools/bindablecontrolhelper.hxx | 5
include/svtools/borderhelper.hxx | 4
include/svtools/borderline.hxx | 1
include/svtools/breadcrumb.hxx | 5
include/svtools/brwbox.hxx | 1
include/svtools/calendar.hxx | 2
include/svtools/collatorres.hxx | 2
include/svtools/ctrlbox.hxx | 7 -
include/svtools/ctrltool.hxx | 1
include/svtools/dialogcontrolling.hxx | 1
include/svtools/editbrowsebox.hxx | 3
include/svtools/ehdl.hxx | 1
include/svtools/embedhlp.hxx | 5
include/svtools/embedtransfer.hxx | 3
include/svtools/extensionlistbox.hxx | 1
include/svtools/filechangedchecker.hxx | 6
include/svtools/filectrl.hxx | 3
include/svtools/fileview.hxx | 7 -
include/svtools/foldertree.hxx | 13 --
include/svtools/framestatuslistener.hxx | 9 -
include/svtools/generictoolboxcontroller.hxx | 1
include/svtools/genericunodialog.hxx | 8 -
include/svtools/helpopt.hxx | 1
include/svtools/htmlout.hxx | 4
include/svtools/htmltokn.h | 1
include/svtools/hyperlabel.hxx | 1
include/svtools/iconview.hxx | 1
include/svtools/imagemgr.hxx | 1
include/svtools/imageresourceaccess.hxx | 6
include/svtools/indexentryres.hxx | 2
include/svtools/insdlg.hxx | 2
include/svtools/ivctrl.hxx | 4
include/svtools/javacontext.hxx | 4
include/svtools/javainteractionhandler.hxx | 5
include/svtools/menuoptions.hxx | 4
include/svtools/miscopt.hxx | 6
include/svtools/openfiledroptargetlistener.hxx | 3
include/svtools/optionsdrawinglayer.hxx | 4
include/svtools/parhtml.hxx | 6
include/svtools/popupmenucontrollerbase.hxx | 13 --
include/svtools/printoptions.hxx | 4
include/svtools/restartdialog.hxx | 3
include/svtools/rtfout.hxx | 5
include/svtools/ruler.hxx | 7 -
include/svtools/sampletext.hxx | 1
include/svtools/scriptedtext.hxx | 5
include/svtools/sfxecode.hxx | 2
include/svtools/simptabl.hxx | 1
include/svtools/slidesorterbaropt.hxx | 5
include/svtools/soerr.hxx | 1
include/svtools/statusbarcontroller.hxx | 13 +-
include/svtools/svmedit.hxx | 2
include/svtools/svparser.hxx | 1
include/svtools/tabbar.hxx | 7 -
include/svtools/table/tableinputhandler.hxx | 3
include/svtools/table/tablemodel.hxx | 7 -
include/svtools/table/tablerenderer.hxx | 7 -
include/svtools/templatefoldercache.hxx | 1
include/svtools/textwindowpeer.hxx | 1
include/svtools/toolbarmenu.hxx | 14 --
include/svtools/toolboxcontroller.hxx | 13 +-
include/svtools/unitconv.hxx | 9 -
include/svtools/unoevent.hxx | 3
include/svtools/unoimap.hxx | 4
include/svtools/valueset.hxx | 6
include/svtools/wizardmachine.hxx | 8 -
include/svtools/wizdlg.hxx | 3
include/svx/dlgctrl.hxx | 1
include/svx/dlgutil.hxx | 1
include/svx/gridctrl.hxx | 1
reportdesign/source/ui/misc/statusbarcontroller.cxx | 1
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 1
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 1
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 1
sd/source/ui/sidebar/PreviewValueSet.cxx | 1
sfx2/source/inet/inettbc.cxx | 1
svtools/inc/table/gridtablerenderer.hxx | 1
svtools/source/brwbox/editbrowsebox2.cxx | 1
svtools/source/contnr/DocumentInfoPreview.cxx | 1
svtools/source/contnr/foldertree.cxx | 7 +
svtools/source/contnr/simptabl.cxx | 1
svtools/source/control/accessibleruler.cxx | 1
svtools/source/control/breadcrumb.cxx | 2
svtools/source/control/ctrlbox.cxx | 3
svtools/source/control/filectrl.cxx | 1
svtools/source/control/hyperlabel.cxx | 1
svtools/source/control/roadmap.cxx | 1
svtools/source/control/ruler.cxx | 3
svtools/source/control/scriptedtext.cxx | 1
svtools/source/control/toolbarmenuacc.cxx | 1
svtools/source/control/valueset.cxx | 2
svtools/source/dialogs/PlaceEditDialog.cxx | 3
svtools/source/dialogs/ServerDetailsControls.cxx | 2
svtools/source/dialogs/addresstemplate.cxx | 6
svtools/source/filter/DocumentToGraphicRenderer.cxx | 3
svtools/source/misc/acceleratorexecute.cxx | 1
svtools/source/misc/embedtransfer.cxx | 1
svtools/source/misc/filechangedchecker.cxx | 2
svtools/source/misc/openfiledroptargetlistener.cxx | 1
svtools/source/misc/sampletext.cxx | 1
svtools/source/misc/unitconv.cxx | 2
svtools/source/svhtml/htmlout.cxx | 1
svtools/source/svrtf/rtfout.cxx | 1
svtools/source/svrtf/svparser.cxx | 1
svtools/source/table/gridtablerenderer.cxx | 1
svtools/source/table/mousefunction.cxx | 1
svtools/source/uno/addrtempuno.cxx | 3
svtools/source/uno/generictoolboxcontroller.cxx | 1
svtools/source/uno/genericunodialog.cxx | 2
svtools/source/uno/popupmenucontrollerbase.cxx | 1
svtools/source/uno/statusbarcontroller.cxx | 3
svtools/source/uno/unocontroltablemodel.hxx | 1
svx/source/dialog/dlgctrl.cxx | 1
svx/source/dialog/rlrcitem.cxx | 1
svx/source/dialog/svxbmpnumvalueset.cxx | 3
svx/source/dialog/svxruler.cxx | 2
svx/source/fmcomp/fmgridif.cxx | 1
svx/source/fmcomp/gridcell.cxx | 1
svx/source/fmcomp/gridctrl.cxx | 1
svx/source/form/xfm_addcondition.cxx | 1
svx/source/mnuctrls/smarttagmenu.cxx | 1
svx/source/sidebar/line/LineWidthValueSet.cxx | 1
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 1
svx/source/stbctrls/pszctrl.cxx | 1
svx/source/stbctrls/zoomsliderctrl.cxx | 1
svx/source/tbxctrls/colrctrl.cxx | 1
svx/source/tbxctrls/fontworkgallery.cxx | 1
svx/source/tbxctrls/tbcontrl.cxx | 1
svx/source/tbxctrls/tbunocontroller.cxx | 2
sw/qa/extras/odfimport/odfimport.cxx | 1
sw/qa/extras/tiledrendering/tiledrendering.cxx | 1
sw/source/filter/html/htmlflywriter.cxx | 1
sw/source/filter/html/htmltabw.cxx | 1
sw/source/ui/misc/outline.cxx | 2
sw/source/uibase/inc/swruler.hxx | 2
sw/source/uibase/ribbar/workctrl.cxx | 1
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 1
sw/source/uibase/sidebar/ThemePanel.cxx | 1
sw/source/uibase/uiview/view.cxx | 1
sw/source/uibase/utlui/viewlayoutctrl.cxx | 1
xmlsecurity/IwyuFilter_xmlsecurity.yaml | 1
xmlsecurity/source/component/documentdigitalsignatures.cxx | 1
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 1
200 files changed, 397 insertions(+), 223 deletions(-)
New commits:
commit 16ee4d434692387419e6493aefba4312b2d80a8c
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Wed Jan 30 00:10:38 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Feb 5 09:15:25 2019 +0100
tdf#42949 Fix IWYU warnings in include/svtools/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I937ed12f2a96943664087ddcdd035f1347e84a57
Reviewed-on: https://gerrit.libreoffice.org/67102
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index a42f88514baf..7fd23faa304f 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -35,6 +35,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/idle.hxx>
+#include <svtools/colorcfg.hxx>
#include <sfx2/progress.hxx>
#include <o3tl/enumarray.hxx>
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index e59984e709fa..379fc0e57821 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -21,6 +21,7 @@
#include <ObjectIdentifier.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/frame/XController.hpp>
#include <cppuhelper/implbase1.hxx>
#include <svtools/toolboxcontroller.hxx>
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index 73f9a4da3125..85a07e63971b 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -10,6 +10,7 @@
#include <FontFeaturesDialog.hxx>
#include <vcl/font/FeatureParser.hxx>
+#include <vcl/virdev.hxx>
#include <svtools/colorcfg.hxx>
#include <svx/dialmgr.hxx>
#include <unordered_set>
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index b62538c53941..e2d55c6bb749 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -34,6 +34,7 @@
#include <svx/dialogs.hrc>
#include <strings.hrc>
#include <vcl/builderfactory.hxx>
+#include <vcl/field.hxx>
#include <vcl/settings.hxx>
#define CM_1_TO_TWIP 567
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 1ba8a0f850be..180ccb6936b2 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -43,6 +43,7 @@
#include <tools/diagnose_ex.h>
#include <ucbhelper/content.hxx>
#include <vcl/weld.hxx>
+#include <vcl/svapp.hxx>
#include <vector>
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 0150dc69bc12..bdcb7e108140 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -20,6 +20,7 @@
#include "AppSwapWindow.hxx"
#include <helpids.h>
#include "AppView.hxx"
+#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
#include <vcl/menu.hxx>
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 9ece79f6830a..a7b94f87aa69 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -22,6 +22,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/toolbox.hxx>
+#include <vcl/event.hxx>
#include <unotools/configmgr.hxx>
#include <vcl/waitobj.hxx>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index fb759da9785f..9ff5ce15e2b5 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -37,6 +37,7 @@
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <vcl/treelistentry.hxx>
+#include <vcl/svapp.hxx>
#include <algorithm>
#include <functional>
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index b8e88925d7fd..cf2ca669e4f3 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/sdbcx/PrivilegeObject.hpp>
#include <com/sun/star/sdbcx/XUsersSupplier.hpp>
#include <com/sun/star/sdbcx/XAuthorizable.hpp>
+#include <vcl/svapp.hxx>
#include <strings.hrc>
#include <UITools.hxx>
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 093755de63a6..21f595116a1f 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -35,6 +35,7 @@
#include <vcl/settings.hxx>
#include <cppuhelper/implbase.hxx>
#include <vcl/event.hxx>
+#include <vcl/svapp.hxx>
using namespace dbaui;
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 6c4cdcc05da9..3969557e061c 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -30,6 +30,7 @@
#include <indexcollection.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <com/sun/star/sdb/SQLContext.hpp>
#include <UITools.hxx>
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 59f0aa57a398..3b0d83ed2403 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -25,6 +25,7 @@
#include <helpids.h>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
+#include <vcl/svapp.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index 3c09a4e68bb9..f21421ed28d9 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/sdbcx/XAuthorizable.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
class Edit;
namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 501949f68ce3..276ad4f3714b 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -43,6 +43,7 @@
#include <osl/diagnose.h>
#include <vcl/treelistentry.hxx>
#include <vcl/commandevent.hxx>
+#include <vcl/svapp.hxx>
using namespace ::svt;
using namespace ::dbaui;
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index eb083fbc0e4d..2a578393be05 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -12,6 +12,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index be0fd79a8962..9e03aefda83e 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -45,6 +45,7 @@
#include "TableFieldControl.hxx"
#include <dsntypes.hxx>
#include <vcl/commandevent.hxx>
+#include <vcl/svapp.hxx>
#include <dbaccess_slotid.hrc>
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index 2fcf2752eb96..b8631b62df71 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/container/XSet.hpp>
#include "DBTypeWizDlgSetup.hxx"
#include <dbwizsetup.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index 20e7361c9125..3c983f5a0669 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -21,6 +21,8 @@
#include <uiservices.hxx>
#include <dbu_reghelper.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <stringconstants.hxx>
#include <queryfilter.hxx>
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index fb9675385738..ef6c755c2bc9 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -28,6 +28,8 @@
#include <cppuhelper/typeprovider.hxx>
#include <connectivity/dbexception.hxx>
#include <vcl/svapp.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
using namespace dbaui;
using namespace dbtools;
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 17bbd76ca36f..636fb2fbe485 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -22,6 +22,9 @@
#include "abspilot.hxx"
#include <comphelper/sequence.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
#define PROPERTY_ID_DATASOURCENAME 3
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index f561d46c9336..3a2390b26845 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -18,6 +18,8 @@
*/
#include <toolkit/helper/vclunohelper.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
#include "MasterDetailLinkDialog.hxx"
#include "formlinkdialog.hxx"
#include "pcrservices.hxx"
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 9d0516f37683..30d02947ab90 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -18,6 +18,7 @@
*/
+#include <com/sun/star/beans/PropertyAttribute.hpp>
#include "controlfontdialog.hxx"
#include <cppuhelper/typeprovider.hxx>
#include "fontdialog.hxx"
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index d927d1d9b4ac..6d0a03e0bf62 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -20,6 +20,8 @@
#include <sal/config.h>
#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include "pcrservices.hxx"
#include "pcrunodialogs.hxx"
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 5195b0ba7fcb..241c44bc7dba 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -45,6 +45,7 @@
#include <unotools/datetime.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <vcl/button.hxx>
+#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 9163d21f141e..c2f1406cc794 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -23,6 +23,7 @@
#include <svl/numuno.hxx>
#include <rtl/math.hxx>
#include <vcl/GraphicObject.hxx>
+#include <vcl/event.hxx>
#include <tools/debug.hxx>
#include <svl/zformat.hxx>
#include <connectivity/dbconversion.hxx>
diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx
index 8d91d4edc605..f2d0abbb33dc 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -20,6 +20,7 @@
#include "GraphicExportFilter.hxx"
#include <com/sun/star/drawing/GraphicExportFilter.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <vcl/graphicfilter.hxx>
#include <svl/outstrm.hxx>
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index d9b6061ae0db..baf8f20f3b23 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/ui/dialogs/ControlActions.hpp>
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <tools/urlobj.hxx>
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index be7666761946..d6184e0a2906 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -7,11 +7,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <config_oauth2.h>
+
#include "RemoteFilesDialog.hxx"
#include <fpsofficeResMgr.hxx>
#include <strings.hrc>
#include <comphelper/docpasswordrequest.hxx>
#include <comphelper/stillreadwriteinteraction.hxx>
+#include <com/sun/star/task/InteractionHandler.hpp>
+#include <ucbhelper/commandenvironment.hxx>
+#include <vcl/treelistentry.hxx>
#include <bitmaps.hlst>
class FileViewContainer : public vcl::Window
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 13e32d48f250..ba86ab2e3ebc 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX
#include <svtools/toolboxcontroller.hxx>
+#include <com/sun/star/container/XIndexAccess.hpp>
#include <tools/link.hxx>
#include <vcl/vclptr.hxx>
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index cd413eac6e05..dc05a51ac6d3 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -85,6 +85,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/bootstrap.hxx>
#include <sal/log.hxx>
+#include <vcl/errcode.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/profilezone.hxx>
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index a473036d913b..0ad8f8e01723 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/frame/status/ItemStatus.hpp>
#include <com/sun/star/frame/status/Visibility.hpp>
#include <com/sun/star/frame/XControlNotificationListener.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <svtools/toolboxcontroller.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 49742cd16957..8f7aba6c9d83 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/builder.hxx>
@@ -40,6 +41,7 @@
#include <vcl/image.hxx>
#include <svtools/menuoptions.hxx>
#include <svtools/popupmenucontrollerbase.hxx>
+#include <toolkit/awt/vclxmenu.hxx>
#include <osl/mutex.hxx>
#include <memory>
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index d9020d97fc4f..20a8ec928f94 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index a2c7f049caac..8b6b0b1ec952 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/view/XPrintable.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <vcl/menu.hxx>
#include <tools/mapunit.hxx>
diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx
index 15f01a02e543..431069c9d2b8 100644
--- a/framework/source/uielement/genericstatusbarcontroller.cxx
+++ b/framework/source/uielement/genericstatusbarcontroller.cxx
@@ -26,6 +26,7 @@
#include <toolkit/helper/convert.hxx>
#include <com/sun/star/ui/ItemStyle.hpp>
+#include <com/sun/star/ui/XStatusbarItem.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/awt/ImageDrawMode.hpp>
#include <com/sun/star/awt/XGraphics2.hpp>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 3f633eaecdf8..5708dbc04108 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index aa19d6faec39..db69de244a91 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/frame/ModuleManager.hpp>
#include <i18nlangtag/mslangid.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/ui/XStatusbarItem.hpp>
#include <com/sun/star/frame/XFrame.hpp>
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 631c65603e3f..1e75ddee652b 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -28,6 +28,8 @@
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <vcl/svapp.hxx>
#include <vcl/i18nhelp.hxx>
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 6ce0354f891c..433f581cdc19 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -43,6 +43,7 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/frame/XSubToolbarController.hpp>
#include <com/sun/star/frame/XUIControllerFactory.hpp>
+#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ucb/CommandFailedException.hpp>
#include <com/sun/star/ucb/ContentCreationException.hpp>
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index d0ae6c355b95..14172000e8ae 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -26,6 +26,7 @@
#include <rtl/ref.hxx>
#include <svtools/popupmenucontrollerbase.hxx>
#include <tools/urlobj.hxx>
+#include <toolkit/awt/vclxmenu.hxx>
#include <unotools/historyoptions.hxx>
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 5f4052361ba2..0ab6b555ad9f 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -30,6 +30,7 @@
#include <properties.h>
#include <helper/mischelper.hxx>
#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/frame/theStatusbarControllerFactory.hpp>
#include <com/sun/star/ui/ItemStyle.hpp>
#include <com/sun/star/ui/ItemType.hpp>
diff --git a/framework/source/uielement/styletoolbarcontroller.cxx b/framework/source/uielement/styletoolbarcontroller.cxx
index a15abce15d21..fa9ff0593048 100644
--- a/framework/source/uielement/styletoolbarcontroller.cxx
+++ b/framework/source/uielement/styletoolbarcontroller.cxx
@@ -14,9 +14,11 @@
#include <vcl/toolbox.hxx>
#include <sal/log.hxx>
+#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/frame/status/Template.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
namespace {
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index 030e6df5eab7..f83b9cf72cce 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -29,6 +29,7 @@
#include <vcl/commandinfoprovider.hxx>
#include <com/sun/star/awt/XDockableWindow.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/frame/XSubToolbarController.hpp>
#include <com/sun/star/frame/status/Visibility.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx
index e5622244070c..4cc9523a914e 100644
--- a/framework/source/uielement/thesaurusmenucontroller.cxx
+++ b/framework/source/uielement/thesaurusmenucontroller.cxx
@@ -21,6 +21,7 @@
#include <svl/lngmisc.hxx>
#include <svtools/popupmenucontrollerbase.hxx>
#include <unotools/lingucfg.hxx>
+#include <toolkit/awt/vclxmenu.hxx>
#include <vcl/commandinfoprovider.hxx>
#include <vcl/image.hxx>
#include <vcl/menu.hxx>
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx
index b61b3cd5e281..9770bec7ec6d 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/ui/UIElementType.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <vcl/menu.hxx>
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 11870476e294..606300d46c27 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 5da7e0550fc0..95379a3d61bd 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -481,3 +481,64 @@ blacklist:
include/xmloff/xmltabe.hxx:
# Needed for css shortcut
- sal/types.h
+ include/svtools/accessibleruler.hxx:
+ # base class has to be a complete type
+ - com/sun/star/accessibility/XAccessible.hpp
+ - com/sun/star/accessibility/XAccessibleComponent.hpp
+ - com/sun/star/accessibility/XAccessibleContext.hpp
+ - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ include/svtools/asynclink.hxx:
+ # unique_ptr needs complete type
+ - osl/mutex.hxx
+ - vcl/idle.hxx
+ include/svtools/cliplistener.hxx:
+ # base class has to be a complete type
+ - com/sun/star/datatransfer/clipboard/XClipboardListener.hpp
+ include/svtools/dialogclosedlistener.hxx:
+ # base class has to be a complete type
+ - com/sun/star/ui/dialogs/XDialogClosedListener.hpp
+ include/svtools/framestatuslistener.hxx:
+ # base class has to be a complete type
+ - com/sun/star/frame/XFrameActionListener.hpp
+ - com/sun/star/frame/XStatusListener.hpp
+ include/svtools/genericunodialog.hxx:
+ # base class has to be a complete type
+ - com/sun/star/lang/XInitialization.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/ui/dialogs/XExecutableDialog.hpp
+ include/svtools/openfiledroptargetlistener.hxx:
+ # base class has to be a complete type
+ - com/sun/star/datatransfer/dnd/XDropTargetListener.hpp
+ include/svtools/popupmenucontrollerbase.hxx:
+ # base class has to be a complete type
+ - com/sun/star/frame/XDispatch.hpp
+ - com/sun/star/frame/XDispatchProvider.hpp
+ - com/sun/star/frame/XPopupMenuController.hpp
+ - com/sun/star/frame/XStatusListener.hpp
+ - com/sun/star/lang/XInitialization.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ include/svtools/popupwindowcontroller.hxx:
+ # base class has to be a complete type
+ - com/sun/star/lang/XServiceInfo.hpp
+ - svtools/toolboxcontroller.hxx
+ include/svtools/sfxecode.hxx:
+ # Needed for macro defines
+ - class ErrCode
+ include/svtools/statusbarcontroller.hxx:
+ # Don't propose hxx -> h change in URE libs
+ - cppuhelper/interfacecontainer.hxx
+ include/svtools/toolboxcontroller.hxx:
+ # base class has to be a complete type
+ - com/sun/star/frame/XStatusListener.hpp
+ - com/sun/star/frame/XToolbarController.hpp
+ - com/sun/star/util/XUpdatable.hpp
+ - com/sun/star/lang/XInitialization.hpp
+ # Complete type is needed for DispatchInfo struct
+ - com/sun/star/beans/PropertyValue.hpp
+ # Don't propose hxx -> h change in URE libs
+ - cppuhelper/interfacecontainer.hxx
+ include/svtools/unoevent.hxx:
+ # base class has to be a complete type
+ - com/sun/star/container/XNameReplace.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx
index 318d70af1209..5a140f59f0cf 100644
--- a/include/sfx2/sfxhtml.hxx
+++ b/include/sfx2/sfxhtml.hxx
@@ -32,6 +32,7 @@
class ImageMap;
class SfxMedium;
class SfxObjectShell;
+class SvNumberFormatter;
class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
{
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx
index cec92f040b41..a4491d2f4510 100644
--- a/include/svtools/DocumentInfoPreview.hxx
+++ b/include/svtools/DocumentInfoPreview.hxx
@@ -20,14 +20,14 @@
#ifndef INCLUDED_SVTOOLS_DOCUMENTINFOPREVIEW_HXX
#define INCLUDED_SVTOOLS_DOCUMENTINFOPREVIEW_HXX
-#include <memory>
#include <sal/config.h>
-#include <com/sun/star/uno/Reference.hxx>
#include <svtools/svtdllapi.h>
#include <tools/wintypes.hxx>
#include <vcl/window.hxx>
+namespace com :: sun :: star :: uno { template <typename > class Reference; }
+
class ExtMultiLineEdit;
namespace com { namespace sun { namespace star {
diff --git a/include/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx
index 49a3ab0b347e..2eff2d731dd9 100644
--- a/include/svtools/DocumentToGraphicRenderer.hxx
+++ b/include/svtools/DocumentToGraphicRenderer.hxx
@@ -23,15 +23,15 @@
#include <vector>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/view/XRenderable.hpp>
-#include <com/sun/star/awt/XToolkit.hpp>
-
#include <vcl/graph.hxx>
#include <svtools/svtdllapi.h>
+namespace com :: sun :: star :: awt { class XToolkit; }
+namespace com :: sun :: star :: frame { class XModel; }
+namespace com :: sun :: star :: lang { class XComponent; }
+namespace com :: sun :: star :: view { class XRenderable; }
+
namespace com { namespace sun { namespace star {
namespace drawing {
class XShapes;
diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx
index df7e1ec2047c..6047e8680e46 100644
--- a/include/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
@@ -10,18 +10,15 @@
#ifndef INCLUDED_SVTOOLS_PLACEEDITDIALOG_HXX
#define INCLUDED_SVTOOLS_PLACEEDITDIALOG_HXX
-#include <svtools/ServerDetailsControls.hxx>
-
+#include <svtools/svtdllapi.h>
#include <vcl/weld.hxx>
-#include <svtools/inettbc.hxx>
-#include <svtools/place.hxx>
-
-#include <config_oauth2.h>
-
#include <memory>
#include <vector>
+class Place;
+class DetailsContainer;
+
class SVT_DLLPUBLIC PlaceEditDialog : public weld::GenericDialogController
{
private:
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index adef4696901c..12fd0f2bba2e 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -9,14 +9,23 @@
#ifndef INCLUDED_SVTOOLS_SERVERDETAILSCONTROLS_HXX
#define INCLUDED_SVTOOLS_SERVERDETAILSCONTROLS_HXX
-#include <map>
+#include <vector>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/task/PasswordContainer.hpp>
-#include <com/sun/star/task/XPasswordContainer2.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <tools/link.hxx>
#include <tools/urlobj.hxx>
-#include <vcl/weld.hxx>
+
+namespace com :: sun :: star :: ucb { class XCommandEnvironment; }
+namespace com :: sun :: star :: awt { class XWindow; }
+
+namespace weld {
+ class Button;
+ class ComboBox;
+ class Entry;
+ class SpinButton;
+ class ToggleButton;
+}
class PlaceEditDialog;
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index b2ec4a04edeb..46911c1e7715 100644
--- a/include/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
@@ -23,18 +23,16 @@
#include <svtools/svtdllapi.h>
#include <memory>
-#include <vector>
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/util/URL.hpp>
+
#include <com/sun/star/awt/KeyEvent.hpp>
#include <vcl/keycod.hxx>
-#include <vcl/evntpost.hxx>
-#include <osl/mutex.h>
+
+namespace com :: sun :: star :: frame { class XDispatchProvider; }
+namespace com :: sun :: star :: frame { class XFrame; }
+namespace com :: sun :: star :: frame { class XModel; }
+namespace com :: sun :: star :: ui { class XAcceleratorConfiguration; }
+namespace com :: sun :: star :: uno { class XComponentContext; }
+namespace com :: sun :: star :: util { class XURLTransformer; }
namespace svt
diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx
index 1cc78a7dc9f5..9aa9ab12f14b 100644
--- a/include/svtools/accessibilityoptions.hxx
+++ b/include/svtools/accessibilityoptions.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVTOOLS_ACCESSIBILITYOPTIONS_HXX
#include <svtools/svtdllapi.h>
-#include <unotools/configitem.hxx>
#include <svl/lstner.hxx>
#include <unotools/options.hxx>
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index 009d152d2dc0..c26cf96fa239 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -23,31 +23,16 @@
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppuhelper/weak.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/compbase5.hxx>
#include <cppuhelper/basemutex.hxx>
#include <vcl/vclptr.hxx>
-namespace com { namespace sun { namespace star { namespace awt {
- struct Point;
- struct Rectangle;
- struct Size;
- class XFocusListener;
-} } } }
-
namespace tools { class Rectangle; }
class Ruler;
-namespace vcl { class Window; }
typedef ::cppu::WeakAggComponentImplHelper5<
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index 752f14f5f8ce..90b2dd308d69 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -23,18 +23,15 @@
#include <memory>
#include <svtools/svtdllapi.h>
#include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
#include <vcl/combobox.hxx>
#include <vcl/button.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/scrbar.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/util/AliasProgrammaticPair.hpp>
-#include <com/sun/star/sdb/XDatabaseContext.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <unotools/configitem.hxx>
+
+namespace com :: sun :: star :: container { class XNameAccess; }
+namespace com :: sun :: star :: sdbc { class XDataSource; }
+namespace com :: sun :: star :: sdb { class XDatabaseContext; }
+namespace com :: sun :: star :: uno { class XComponentContext; }
+namespace com :: sun :: star :: util { struct AliasProgrammaticPair; }
#define FIELD_PAIRS_VISIBLE 5
#define FIELD_CONTROLS_VISIBLE 2 * FIELD_PAIRS_VISIBLE
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index 5a5c891ef97a..9c72c42e8abf 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -21,13 +21,11 @@
#define INCLUDED_SVTOOLS_ASYNCLINK_HXX
#include <svtools/svtdllapi.h>
-#include <tools/solar.h>
#include <tools/link.hxx>
#include <vcl/idle.hxx>
#include <osl/mutex.hxx>
#include <memory>
-class Idle;
class Timer;
struct ImplSVEvent;
diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx
index 847e0711742e..d05f52b71e9f 100644
--- a/include/svtools/bindablecontrolhelper.hxx
+++ b/include/svtools/bindablecontrolhelper.hxx
@@ -22,7 +22,10 @@
#include <svtools/svtdllapi.h>
-#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com :: sun :: star :: frame { class XModel; }
+namespace com :: sun :: star :: uno { class XInterface; }
namespace svt
{
diff --git a/include/svtools/borderhelper.hxx b/include/svtools/borderhelper.hxx
index 43d757be80b0..3692cdf5a3d9 100644
--- a/include/svtools/borderhelper.hxx
+++ b/include/svtools/borderhelper.hxx
@@ -25,7 +25,9 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/point/b2dpoint.hxx>
-#include <vcl/outdev.hxx>
+
+class OutputDevice;
+class Point;
enum class SvxBorderLineStyle : sal_Int16;
diff --git a/include/svtools/borderline.hxx b/include/svtools/borderline.hxx
index d4811ffa267c..1d7d9f1cd2f7 100644
--- a/include/svtools/borderline.hxx
+++ b/include/svtools/borderline.hxx
@@ -22,7 +22,6 @@
#include <svtools/svtdllapi.h>
#include <o3tl/typed_flags_set.hxx>
-#include <memory>
/**
Class computing border widths shared between Line style listbox and the
diff --git a/include/svtools/breadcrumb.hxx b/include/svtools/breadcrumb.hxx
index 87273a5a36bc..1889d923441c 100644
--- a/include/svtools/breadcrumb.hxx
+++ b/include/svtools/breadcrumb.hxx
@@ -12,13 +12,12 @@
#include <svtools/svtdllapi.h>
-#include <tools/urlobj.hxx>
-
-#include <vcl/fixedhyper.hxx>
#include <vcl/layout.hxx>
#include <vector>
+class FixedHyperlink;
+
#define SPACING 6
enum SvtBreadcrumbMode
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index fbff8176572e..eecf189cca84 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -39,7 +39,6 @@
class BrowserColumn;
class BrowserDataWin;
-class MultiSelection;
class BrowserHeader;
namespace svt {
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 7674885dc0c0..cc5b62ba9e70 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -22,10 +22,8 @@
#include <svtools/svtdllapi.h>
#include <unotools/calendarwrapper.hxx>
-#include <com/sun/star/i18n/Weekdays.hpp>
#include <vcl/ctrl.hxx>
-#include <vcl/timer.hxx>
#include <vcl/field.hxx>
#include <memory>
#include <set>
diff --git a/include/svtools/collatorres.hxx b/include/svtools/collatorres.hxx
index 5b41b61cc9ad..adb854213d5f 100644
--- a/include/svtools/collatorres.hxx
+++ b/include/svtools/collatorres.hxx
@@ -24,8 +24,6 @@
#include <rtl/ustring.hxx>
#include <vector>
-class CollatorResourceData;
-
class SVT_DLLPUBLIC CollatorResource
{
private:
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 5b2583e5ce13..eea2e0a51023 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -22,18 +22,17 @@
#include <svtools/svtdllapi.h>
-#include <vcl/customweld.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
-#include <vcl/image.hxx>
-#include <vcl/virdev.hxx>
#include <vcl/metric.hxx>
#include <vcl/field.hxx>
#include <vcl/weld.hxx>
-#include <com/sun/star/table/BorderLineStyle.hpp>
#include <memory>
+namespace weld { class CustomWeld; }
+
+class VirtualDevice;
class BorderWidthImpl;
class FontList;
class ImpLineListData;
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index d462088fc2d4..c2f859b4208b 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -25,7 +25,6 @@
#include <sal/types.h>
#include <vcl/metric.hxx>
#include <vcl/vclptr.hxx>
-#include <tools/solar.h>
#include <vector>
#include <memory>
diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx
index ada35ea75581..a3915a3d40b3 100644
--- a/include/svtools/dialogcontrolling.hxx
+++ b/include/svtools/dialogcontrolling.hxx
@@ -27,7 +27,6 @@
#include <vcl/vclevent.hxx>
#include <memory>
-#include <vector>
namespace svt
{
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 9080c6a4f617..b3f4483f9450 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -31,10 +31,8 @@
#include <vcl/button.hxx>
#include <svtools/brwbox.hxx>
-#include <vcl/timer.hxx>
#include <svtools/brwhead.hxx>
#include <svtools/svmedit.hxx>
-#include <vcl/svapp.hxx>
#include <o3tl/typed_flags_set.hxx>
@@ -74,7 +72,6 @@ namespace o3tl
class Edit;
-class SpinField;
class FormattedField;
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index 99a2016e091e..24878019ec0e 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVTOOLS_EHDL_HXX
#define INCLUDED_SVTOOLS_EHDL_HXX
-#include <memory>
#include <svtools/svtdllapi.h>
#include <svtools/svtresid.hxx>
#include <vcl/errinf.hxx>
diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx
index 5e74e97a3d60..ad9a592ae6c0 100644
--- a/include/svtools/embedhlp.hxx
+++ b/include/svtools/embedhlp.hxx
@@ -22,12 +22,12 @@
#include <svtools/svtdllapi.h>
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/io/XInputStream.hpp>
#include <vcl/graph.hxx>
-#include <tools/mapunit.hxx>
#include <rtl/ustring.hxx>
#include <memory>
+namespace com :: sun :: star :: io { class XInputStream; }
+
namespace comphelper
{
class EmbeddedObjectContainer;
@@ -37,7 +37,6 @@ namespace com { namespace sun { namespace star { namespace embed {
class XEmbeddedObject;
}}}}
-namespace tools { class Rectangle; }
class OutputDevice;
namespace svt {
diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx
index ca69d2b28386..59394bc27675 100644
--- a/include/svtools/embedtransfer.hxx
+++ b/include/svtools/embedtransfer.hxx
@@ -21,10 +21,11 @@
#define INCLUDED_SVTOOLS_EMBEDTRANSFER_HXX
#include <svtools/svtdllapi.h>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <vcl/transfer.hxx>
#include <memory>
+namespace com :: sun :: star :: embed { class XEmbeddedObject; }
+
class Graphic;
class SVT_DLLPUBLIC SvEmbedTransferHelper : public TransferableHelper
{
diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx
index 9d1a4bb95a24..f246c5a02448 100644
--- a/include/svtools/extensionlistbox.hxx
+++ b/include/svtools/extensionlistbox.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVTOOLS_EXTENSIONLISTBOX_HXX
#include <vcl/ctrl.hxx>
-#include <rtl/ustring.hxx>
namespace svt
diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx
index 97a3a0617a3c..ec8d8a41fdac 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -12,12 +12,14 @@
#include <svtools/svtdllapi.h>
-#include <osl/file.hxx>
-#include <vcl/timer.hxx>
+#include <osl/time.h>
+#include <rtl/ustring.hxx>
#include <vcl/idle.hxx>
#include <functional>
+class Timer;
+
/** Periodically checks if a file has been modified
Instances of this class setup a vcl timer to occasionally wake up
diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx
index 280b76ffd127..fc4fd00f003c 100644
--- a/include/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
@@ -22,9 +22,10 @@
#include <svtools/svtdllapi.h>
#include <vcl/window.hxx>
-#include <vcl/edit.hxx>
#include <vcl/button.hxx>
+class Edit;
+
// Flags for internal use of FileControl
enum class FileControlMode_Internal
{
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index af19027a2601..c53edb0c017a 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -22,17 +22,14 @@
#include <memory>
#include <svtools/svtdllapi.h>
#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/ucb/XContent.hpp>
#include <vcl/ctrl.hxx>
-#include <vcl/image.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
#include <vcl/weld.hxx>
#include <rtl/ustring.hxx>
+namespace com :: sun :: star :: ucb { class XContent; }
+
// class SvtFileView -----------------------------------------------------
-class ViewTabListBox_Impl;
class SvtFileView_Impl;
class SvTreeListEntry;
class HeaderBar;
diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx
index 29c2534c331f..f62cc71be6f3 100644
--- a/include/svtools/foldertree.hxx
+++ b/include/svtools/foldertree.hxx
@@ -11,23 +11,18 @@
#define INCLUDED_SVTOOLS_FOLDERTREE_HXX
#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/task/InteractionHandler.hpp>
-
-#include <officecfg/Office/Common.hxx>
#include <svtools/svtdllapi.h>
-#include <tools/urlobj.hxx>
+#include <tools/wintypes.hxx>
+#include <vcl/treelistbox.hxx>
-#include <ucbhelper/commandenvironment.hxx>
+namespace com :: sun :: star :: ucb { class XCommandEnvironment; }
-#include <vcl/image.hxx>
-#include <vcl/treelistentry.hxx>
+class SvTreeListEntry;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::task;
using namespace ::svt;
class SVT_DLLPUBLIC FolderTree : public SvTreeListBox
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index 0fa756b08dc8..b4999bfba9ad 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -21,18 +21,17 @@
#define INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX
#include <svtools/svtdllapi.h>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/basemutex.hxx>
#include <unordered_map>
+namespace com :: sun :: star :: frame { class XDispatch; }
+namespace com :: sun :: star :: frame { class XFrame; }
+namespace com :: sun :: star :: uno { class XComponentContext; }
+
namespace svt
{
diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx
index c309ec3956b4..7e792b9f4d3a 100644
--- a/include/svtools/generictoolboxcontroller.hxx
+++ b/include/svtools/generictoolboxcontroller.hxx
@@ -27,7 +27,6 @@
namespace svt
{
-struct ExecuteInfo;
class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController
{
public:
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index 46c56a0d781a..108f8a61f09a 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -24,15 +24,10 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/lang/NotInitializedException.hpp>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/propshlp.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
@@ -41,6 +36,9 @@
#include <vcl/vclptr.hxx>
#include <vcl/weld.hxx>
+namespace com :: sun :: star :: awt { class XWindow; }
+namespace com :: sun :: star :: uno { class XComponentContext; }
+
class VclWindowEvent;
diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx
index 07ad90c1c191..358a107c410f 100644
--- a/include/svtools/helpopt.hxx
+++ b/include/svtools/helpopt.hxx
@@ -21,7 +21,6 @@
#include <svtools/svtdllapi.h>
-#include <list>
#include <rtl/ustring.hxx>
#include <unotools/options.hxx>
#include <memory>
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 6fbff8903609..b5685840b431 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -26,12 +26,10 @@
#include <rtl/string.hxx>
#include <svl/macitem.hxx>
-#include <svtools/HtmlWriter.hxx>
-
class Color;
class ImageMap;
+class HtmlWriter;
class SvStream;
-class SvxMacroTableDtor;
class SvNumberFormatter;
struct HTMLOutEvent
diff --git a/include/svtools/htmltokn.h b/include/svtools/htmltokn.h
index 46e0fb57fb2f..a3374a37e877 100644
--- a/include/svtools/htmltokn.h
+++ b/include/svtools/htmltokn.h
@@ -22,7 +22,6 @@
#include <svtools/svtdllapi.h>
#include <sal/types.h>
-#include <cassert>
#include <stdexcept>
namespace rtl {
diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx
index bd86801724ae..b4a6b22dbff1 100644
--- a/include/svtools/hyperlabel.hxx
+++ b/include/svtools/hyperlabel.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVTOOLS_HYPERLABEL_HXX
#include <memory>
-#include <vcl/event.hxx>
#include <vcl/fixed.hxx>
diff --git a/include/svtools/iconview.hxx b/include/svtools/iconview.hxx
index 2281d35e94d4..17a9103e9c2f 100644
--- a/include/svtools/iconview.hxx
+++ b/include/svtools/iconview.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVTOOLS_ICONVIEW_HXX
#define INCLUDED_SVTOOLS_ICONVIEW_HXX
-#include <svtools/svtdllapi.h>
#include <vcl/treelistbox.hxx>
class IconView : public SvTreeListBox
diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx
index feaa9d537e60..a72566586eb8 100644
--- a/include/svtools/imagemgr.hxx
+++ b/include/svtools/imagemgr.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVTOOLS_IMAGEMGR_HXX
#include <rtl/ustring.hxx>
-#include <sal/types.h>
#include <svtools/svtdllapi.h>
enum class SvImageId {
diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx
index 0ad0eb7d35cb..782091cf2cc3 100644
--- a/include/svtools/imageresourceaccess.hxx
+++ b/include/svtools/imageresourceaccess.hxx
@@ -22,8 +22,10 @@
#include <svtools/svtdllapi.h>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com :: sun :: star :: io { class XInputStream; }
+namespace com :: sun :: star :: uno { class XComponentContext; }
class SvStream;
diff --git a/include/svtools/indexentryres.hxx b/include/svtools/indexentryres.hxx
index 2de22b01cef4..800ee906e3ce 100644
--- a/include/svtools/indexentryres.hxx
+++ b/include/svtools/indexentryres.hxx
@@ -24,8 +24,6 @@
#include <rtl/ustring.hxx>
#include <vector>
-class IndexEntryResourceData;
-
class SVT_DLLPUBLIC IndexEntryResource
{
private:
diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 9aae287249b8..add32fffcada 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -20,8 +20,6 @@
#define INCLUDED_SVTOOLS_INSDLG_HXX
#include <svtools/svtdllapi.h>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
#include <tools/globname.hxx>
#include <sot/formats.hxx>
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index f4625fe27a8a..ec28ec339c26 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -24,15 +24,11 @@
#include <svtools/svtdllapi.h>
#include <vcl/ctrl.hxx>
#include <tools/link.hxx>
-#include <tools/contnr.hxx>
#include <vcl/image.hxx>
-#include <vcl/seleng.hxx>
#include <o3tl/deleter.hxx>
#include <o3tl/typed_flags_set.hxx>
-class Point;
class SvxIconChoiceCtrl_Impl;
-class Image;
enum class SvxIconViewFlags
{
diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx
index 19b6f26acdd6..99274c1c2090 100644
--- a/include/svtools/javacontext.hxx
+++ b/include/svtools/javacontext.hxx
@@ -22,11 +22,11 @@
#include <svtools/svtdllapi.h>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/task/XInteractionRequest.hpp>
#include <com/sun/star/uno/XCurrentContext.hpp>
+namespace com :: sun :: star :: task { class XInteractionHandler; }
+
namespace svt
{
// We cannot derive from cppu::WeakImplHelper because we would export the inline
diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx
index 80529d36f424..23249a5dc8e8 100644
--- a/include/svtools/javainteractionhandler.hxx
+++ b/include/svtools/javainteractionhandler.hxx
@@ -23,8 +23,9 @@
#include <svtools/svtdllapi.h>
#include <sal/types.h>
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <svtools/javacontext.hxx>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+
+namespace com :: sun :: star :: task { class XInteractionRequest; }
#define JAVA_INTERACTION_HANDLER_NAME "java-vm.interaction-handler"
diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx
index a50daf4ff10a..0408443338b6 100644
--- a/include/svtools/menuoptions.hxx
+++ b/include/svtools/menuoptions.hxx
@@ -22,11 +22,11 @@
#include <svtools/svtdllapi.h>
#include <sal/types.h>
#include <tools/gen.hxx>
-#include <tools/link.hxx>
-#include <osl/mutex.hxx>
#include <unotools/options.hxx>
#include <memory>
+namespace osl { class Mutex; }
+
/*-************************************************************************************************************
@short forward declaration to our private date container implementation
@descr We use these class as internal member to support small memory requirements.
diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx
index dc60c6a22745..b84bbc2da8d4 100644
--- a/include/svtools/miscopt.hxx
+++ b/include/svtools/miscopt.hxx
@@ -21,12 +21,14 @@
#include <svtools/svtdllapi.h>
#include <sal/types.h>
-#include <tools/link.hxx>
-#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
#include <unotools/options.hxx>
#include <memory>
+namespace osl { class Mutex; }
+template <typename Arg, typename Ret> class Link;
+class LinkParamNone;
+
/*-************************************************************************************************************
@short forward declaration to our private date container implementation
@descr We use these class as internal member to support small memory requirements.
diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx
index 695f14df7135..d5a83b8ff1da 100644
--- a/include/svtools/openfiledroptargetlistener.hxx
+++ b/include/svtools/openfiledroptargetlistener.hxx
@@ -23,13 +23,14 @@
#include <svtools/svtdllapi.h>
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <sot/exchange.hxx>
+namespace com :: sun :: star :: frame { class XFrame; }
+
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
} } } }
diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx
index 866cb5ed23b1..d3cb4a00c0b2 100644
--- a/include/svtools/optionsdrawinglayer.hxx
+++ b/include/svtools/optionsdrawinglayer.hxx
@@ -22,11 +22,11 @@
#include <svtools/svtdllapi.h>
#include <sal/types.h>
-#include <osl/mutex.hxx>
-#include <rtl/ustring.hxx>
#include <tools/color.hxx>
#include <memory>
+namespace osl { class Mutex; }
+
/*-************************************************************************************************************
@short forward declaration to our private date container implementation
@descr We use these class as internal member to support small memory requirements.
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index b2ece425a87e..c2f9d850bd79 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -20,12 +20,14 @@
#ifndef INCLUDED_SVTOOLS_PARHTML_HXX
#define INCLUDED_SVTOOLS_PARHTML_HXX
-#include <com/sun/star/uno/Reference.h>
#include <svtools/svtdllapi.h>
#include <svtools/svparser.hxx>
+#include <svtools/htmltokn.h>
#include <vector>
+namespace com :: sun :: star :: uno { template <class interface_type> class Reference; }
+
namespace com { namespace sun { namespace star {
namespace document {
class XDocumentProperties;
@@ -33,8 +35,6 @@ namespace com { namespace sun { namespace star {
} } }
class Color;
-class SvNumberFormatter;
-class SvKeyValueIterator;
enum class HtmlOptionId;
#define HTMLFONTSZ1_DFLT 7
diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx
index ff4b62f04313..aba659970ec3 100644
--- a/include/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
@@ -23,26 +23,23 @@
#include <svtools/svtdllapi.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/frame/XPopupMenuController.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <toolkit/awt/vclxmenu.hxx>
+#include <tools/link.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
+namespace com :: sun :: star :: frame { class XFrame; }
+namespace com :: sun :: star :: uno { class XComponentContext; }
+namespace com :: sun :: star :: util { class XURLTransformer; }
+
namespace svt
{
- struct PopupMenuControllerBaseDispatchInfo;
typedef cppu::WeakComponentImplHelper<
css::lang::XServiceInfo ,
diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx
index f06a53d5ae44..2cb5315b02f3 100644
--- a/include/svtools/printoptions.hxx
+++ b/include/svtools/printoptions.hxx
@@ -22,10 +22,10 @@
#include <svtools/svtdllapi.h>
#include <sal/types.h>
-#include <osl/mutex.hxx>
-#include <rtl/ustring.hxx>
#include <unotools/options.hxx>
+namespace osl { class Mutex; }
+
class SvtPrintOptions_Impl;
class PrinterOptions;
diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx
index 932a03271a1e..a49289b5f8f7 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -12,9 +12,10 @@
#include <sal/config.h>
-#include <com/sun/star/uno/Reference.hxx>
#include <svtools/svtdllapi.h>
+namespace com :: sun :: star :: uno { template <typename > class Reference; }
+
namespace weld { class Window; }
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
diff --git a/include/svtools/rtfout.hxx b/include/svtools/rtfout.hxx
index 2f8751faf29f..1bcd3361b370 100644
--- a/include/svtools/rtfout.hxx
+++ b/include/svtools/rtfout.hxx
@@ -21,13 +21,10 @@
#define INCLUDED_SVTOOLS_RTFOUT_HXX
#include <svtools/svtdllapi.h>
-#include <tools/solar.h>
+#include <rtl/ustring.hxx>
#include <rtl/textenc.h>
-namespace rtl {
- class OUString;
-};
class SvStream;
namespace RTFOutFuncs {
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 8f042909bd2b..3aedb16531de 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -24,19 +24,16 @@
#include <map>
#include <svtools/svtdllapi.h>
#include <rtl/ref.hxx>
+#include <tools/fldunit.hxx>
#include <tools/link.hxx>
#include <tools/fract.hxx>
#include <vcl/window.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/field.hxx>
#include <vcl/glyphitem.hxx>
-#include <vcl/vcllayout.hxx>
-
-#include <svtools/accessibleruler.hxx>
class MouseEvent;
class TrackingEvent;
class DataChangedEvent;
+class SvtRulerAccessible;
/*************************************************************************
diff --git a/include/svtools/sampletext.hxx b/include/svtools/sampletext.hxx
index 1f68e108b3bf..b9c53ad4c3d5 100644
--- a/include/svtools/sampletext.hxx
+++ b/include/svtools/sampletext.hxx
@@ -13,7 +13,6 @@
#include <rtl/ustring.hxx>
#include <unicode/uscript.h>
#include <i18nlangtag/lang.h>
-#include <com/sun/star/i18n/ScriptType.hpp>
#include <vcl/fontcapabilities.hxx>
class OutputDevice;
diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx
index 7b8d6cd0f46e..603ff22cb8d8 100644
--- a/include/svtools/scriptedtext.hxx
+++ b/include/svtools/scriptedtext.hxx
@@ -21,10 +21,13 @@
#define INCLUDED_SVTOOLS_SCRIPTEDTEXT_HXX
#include <svtools/svtdllapi.h>
-#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <rtl/ustring.hxx>
#include <memory>
+namespace com :: sun :: star :: i18n { class XBreakIterator; }
+namespace com :: sun :: star :: uno { template <typename > class Reference; }
+
class OutputDevice;
namespace vcl { class Font; }
class SvtScriptedTextHelper_Impl;
diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx
index 3cc2f28e4816..3cdad87f4cd9 100644
--- a/include/svtools/sfxecode.hxx
+++ b/include/svtools/sfxecode.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SVTOOLS_SFXECODE_HXX
#define INCLUDED_SVTOOLS_SFXECODE_HXX
-#include <vcl/errcode.hxx>
+class ErrCode;
#define ERRCODE_SFX_NOTATEMPLATE ErrCode(ErrCodeArea::Sfx, ErrCodeClass::Format, 2)
#define ERRCODE_SFX_GENERAL ErrCode(ErrCodeArea::Sfx, ErrCodeClass::General, 3)
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 7f999a809623..b853a21fd497 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -23,7 +23,6 @@
#include <svtools/svtdllapi.h>
#include <vcl/headbar.hxx>
#include <vcl/svtabbx.hxx>
-#include <unotools/intlwrapper.hxx>
#include <unotools/collatorwrapper.hxx>
#include <vcl/commandevent.hxx>
diff --git a/include/svtools/slidesorterbaropt.hxx b/include/svtools/slidesorterbaropt.hxx
index 6471a6cca6e6..4a1d5ab9890d 100644
--- a/include/svtools/slidesorterbaropt.hxx
+++ b/include/svtools/slidesorterbaropt.hxx
@@ -21,12 +21,11 @@
#define INCLUDED_SVTOOLS_SLIDESORTERBAROPT_HXX
#include <svtools/svtdllapi.h>
-#include <sal/types.h>
-#include <osl/mutex.hxx>
-#include <rtl/ustring.hxx>
#include <unotools/options.hxx>
#include <memory>
+namespace osl { class Mutex; }
+
/** forward declaration to our private date container implementation
We use these class as internal member to support small memory requirements.
diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx
index 9f39f6ca1563..1e882ea76d3a 100644
--- a/include/svtools/soerr.hxx
+++ b/include/svtools/soerr.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SVTOOLS_SOERR_HXX
#define INCLUDED_SVTOOLS_SOERR_HXX
-#include <vcl/errcode.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/svtdllapi.h>
diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx
index d27adb6d6664..8eb05b4798f2 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -21,18 +21,21 @@
#define INCLUDED_SVTOOLS_STATUSBARCONTROLLER_HXX
#include <svtools/svtdllapi.h>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XStatusbarController.hpp>
-#include <com/sun/star/ui/XStatusbarItem.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/basemutex.hxx>
#include <tools/gen.hxx>
#include <unordered_map>
+namespace com :: sun :: star :: awt { class XWindow; }
+namespace com :: sun :: star :: beans { struct PropertyValue; }
+namespace com :: sun :: star :: frame { class XDispatch; }
+namespace com :: sun :: star :: frame { class XFrame; }
+namespace com :: sun :: star :: ui { class XStatusbarItem; }
+namespace com :: sun :: star :: uno { class XComponentContext; }
+namespace com :: sun :: star :: util { class XURLTransformer; }
+
namespace svt
{
diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx
index e5493524ec21..361a1c5b7391 100644
--- a/include/svtools/svmedit.hxx
+++ b/include/svtools/svmedit.hxx
@@ -20,11 +20,9 @@
#ifndef INCLUDED_SVTOOLS_SVMEDIT_HXX
#define INCLUDED_SVTOOLS_SVMEDIT_HXX
-#include <vcl/svapp.hxx>
#include <vcl/vclmedit.hxx>
#include <svtools/svtdllapi.h>
-#include <svtools/colorcfg.hxx>
class SVT_DLLPUBLIC MultiLineEdit : public VclMultiLineEdit
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index b6333434a828..7acd05b5a70c 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVTOOLS_SVPARSER_HXX
#include <svtools/svtdllapi.h>
-#include <svtools/htmltokn.h>
#include <tools/link.hxx>
#include <tools/ref.hxx>
#include <tools/solar.h>
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index cccd894b36cb..bccdbb55d3ed 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -23,10 +23,11 @@
#include <svtools/svtdllapi.h>
#include <tools/link.hxx>
#include <vcl/window.hxx>
-#include <vcl/settings.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
+class StyleSettings;
+
/*
Allowed StylbeBits
@@ -300,11 +301,7 @@ enum TabBarAllowRenamingReturnCode {
};
class MouseEvent;
-class TrackingEvent;
class DataChangedEvent;
-class ImplTabButton;
-class ImplTabSizer;
-class TabBarEdit;
struct ImplTabBarItem;
struct TabBar_Impl;
diff --git a/include/svtools/table/tableinputhandler.hxx b/include/svtools/table/tableinputhandler.hxx
index 70bfe397a243..0eba9b5069f0 100644
--- a/include/svtools/table/tableinputhandler.hxx
+++ b/include/svtools/table/tableinputhandler.hxx
@@ -24,9 +24,6 @@
class MouseEvent;
class KeyEvent;
-class HelpEvent;
-class CommandEvent;
-class NotifyEvent;
namespace svt { namespace table
diff --git a/include/svtools/table/tablemodel.hxx b/include/svtools/table/tablemodel.hxx
index a134575cba56..7962900e597d 100644
--- a/include/svtools/table/tablemodel.hxx
+++ b/include/svtools/table/tablemodel.hxx
@@ -24,19 +24,20 @@
#include <svtools/table/tabletypes.hxx>
#include <svtools/table/tablerenderer.hxx>
#include <svtools/table/tableinputhandler.hxx>
-#include <svtools/table/tablesort.hxx>
-#include <com/sun/star/util/Color.hpp>
#include <com/sun/star/style/VerticalAlignment.hpp>
#include <com/sun/star/style/HorizontalAlignment.hpp>
-#include <rtl/ref.hxx>
#include <sal/types.h>
#include <boost/optional.hpp>
#include <memory>
#include <o3tl/typed_flags_set.hxx>
+namespace svt { namespace table { class ITableDataSort; } }
+
+class Color;
+
enum class ColumnAttributeGroup
{
NONE = 0x00,
diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx
index fa75952e94e4..ff738c6de623 100644
--- a/include/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
@@ -22,10 +22,15 @@
#include <svtools/table/tabletypes.hxx>
-#include <vcl/outdev.hxx>
+#include <rtl/ustring.hxx>
#include <memory>
+namespace com :: sun :: star :: uno { class Any; }
+namespace tools { class Rectangle; }
+namespace vcl { class Window; }
+
+class OutputDevice;
class StyleSettings;
diff --git a/include/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx
index cee6bcbecc1b..2bcba8e7ec65 100644
--- a/include/svtools/templatefoldercache.hxx
+++ b/include/svtools/templatefoldercache.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVTOOLS_TEMPLATEFOLDERCACHE_HXX
#include <svtools/svtdllapi.h>
-#include <sal/types.h>
#include <o3tl/deleter.hxx>
#include <memory>
diff --git a/include/svtools/textwindowpeer.hxx b/include/svtools/textwindowpeer.hxx
index 7da6b83d2ef6..b67da50980bf 100644
--- a/include/svtools/textwindowpeer.hxx
+++ b/include/svtools/textwindowpeer.hxx
@@ -23,7 +23,6 @@
#include <sal/config.h>
#include <com/sun/star/uno/Reference.hxx>
-#include <sal/types.h>
#include <svtools/svtdllapi.h>
namespace com { namespace sun { namespace star { namespace awt {
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index 352a7d6368d5..bd73d7cb2784 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -21,21 +21,17 @@
#define INCLUDED_SVTOOLS_TOOLBARMENU_HXX
#include <svtools/svtdllapi.h>
-#include <svtools/framestatuslistener.hxx>
-
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
#include <memory>
-#include <vector>
#include <rtl/ref.hxx>
-
-#include <vcl/ctrl.hxx>
-#include <vcl/menu.hxx>
#include <vcl/dockwin.hxx>
+namespace com :: sun :: star :: frame { class XFrame; }
+namespace com :: sun :: star :: frame { struct FeatureStateEvent; }
+namespace svt { class FrameStatusListener; }
+
+class Control;
class ValueSet;
namespace svtools {
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index 75945673e8b4..5d86aeb35930 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -21,15 +21,12 @@
#define INCLUDED_SVTOOLS_TOOLBOXCONTROLLER_HXX
#include <svtools/svtdllapi.h>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/frame/XToolbarController.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XUpdatable.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
@@ -40,6 +37,12 @@
#include <unordered_map>
+namespace com :: sun :: star :: frame { class XDispatch; }
+namespace com :: sun :: star :: frame { class XFrame; }
+namespace com :: sun :: star :: frame { class XLayoutManager; }
+namespace com :: sun :: star :: uno { class XComponentContext; }
+namespace com :: sun :: star :: util { class XURLTransformer; }
+
class ToolBox;
namespace svt
diff --git a/include/svtools/unitconv.hxx b/include/svtools/unitconv.hxx
index e55acb40c3e5..f787e0cee42d 100644
--- a/include/svtools/unitconv.hxx
+++ b/include/svtools/unitconv.hxx
@@ -19,10 +19,13 @@
#ifndef INCLUDED_SVTOOLS_UNITCONV_HXX
#define INCLUDED_SVTOOLS_UNITCONV_HXX
-#include <vcl/field.hxx>
-#include <vcl/weld.hxx>
#include <svtools/svtdllapi.h>
-#include <svl/poolitem.hxx>
+#include <tools/mapunit.hxx>
+#include <tools/fldunit.hxx>
+
+namespace weld { class MetricSpinButton; }
+
+class MetricField;
// macro -----------------------------------------------------------------
diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx
index 8fd990e37c67..448573c117bd 100644
--- a/include/svtools/unoevent.hxx
+++ b/include/svtools/unoevent.hxx
@@ -22,11 +22,12 @@
#include <svtools/svtdllapi.h>
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
#include <cppuhelper/implbase.hxx>
#include <vector>
#include <memory>
+namespace com :: sun :: star :: uno { class XInterface; }
+
class SvxMacroTableDtor;
class SvxMacroItem;
class SvxMacro;
diff --git a/include/svtools/unoimap.hxx b/include/svtools/unoimap.hxx
index 7ce4814e6b83..58810153c43c 100644
--- a/include/svtools/unoimap.hxx
+++ b/include/svtools/unoimap.hxx
@@ -21,7 +21,9 @@
#define INCLUDED_SVTOOLS_UNOIMAP_HXX
#include <svtools/svtdllapi.h>
-#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com :: sun :: star :: uno { class XInterface; }
class ImageMap;
struct SvEventDescription;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 2a37ea21216b..d0a50fcf76c6 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -22,9 +22,7 @@
#include <svtools/svtdllapi.h>
-#include <vcl/event.hxx>
#include <vcl/ctrl.hxx>
-#include <vcl/virdev.hxx>
#include <vcl/timer.hxx>
#include <vcl/customweld.hxx>
#include <memory>
@@ -36,12 +34,12 @@ class HelpEvent;
class KeyEvent;
class DataChangedEvent;
class ScrollBar;
+class UserDrawEvent;
+class VirtualDevice;
struct ValueSetItem;
struct SvtValueSetItem;
-class ValueSetAcc;
-class ValueItemAcc;
enum class DrawFrameStyle;
/*************************************************************************
diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx
index 748afebbb712..ee2d32a39107 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -24,10 +24,12 @@
#include <svtools/wizdlg.hxx>
#include <vcl/button.hxx>
#include <vcl/tabpage.hxx>
-#include <vcl/weld.hxx>
#include <o3tl/typed_flags_set.hxx>
-class Bitmap;
+namespace weld {
+ class Builder;
+ class Container;
+}
enum class WizardButtonFlags
{
@@ -94,8 +96,6 @@ namespace svt
//= OWizardPage
- class OWizardMachine;
-
class SVT_DLLPUBLIC OWizardPage : public TabPage, public IWizardPageController
{
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 7d8b54e33119..dac116d371ea 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -22,12 +22,11 @@
#include <svtools/svtdllapi.h>
+#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/idle.hxx>
class TabPage;
-class Button;
-class PushButton;
struct ImplWizPageData;
struct ImplWizButtonData;
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index fd51e5264dd3..08cb40dea074 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -26,6 +26,7 @@
#include <vcl/graph.hxx>
#include <vcl/customweld.hxx>
#include <vcl/weld.hxx>
+#include <vcl/virdev.hxx>
#include <svx/xtable.hxx>
#include <rtl/ref.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx
index 76b2a600c718..55c914bfd864 100644
--- a/include/svx/dlgutil.hxx
+++ b/include/svx/dlgutil.hxx
@@ -22,6 +22,7 @@
#include <svtools/unitconv.hxx>
#include <svx/svxdllapi.h>
+#include <vcl/outdev.hxx>
class SfxItemSet;
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 56bf87726d6b..fecb365b34ec 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index e7408806e2fc..7be11dc6be27 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -31,6 +31,7 @@
#include <vcl/status.hxx>
#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
namespace rptui
{
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index c4dc406b0bf9..061e949e62d3 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -28,6 +28,7 @@
#include <svx/drawitem.hxx>
#include <unotools/pathoptions.hxx>
#include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
#include <osl/diagnose.h>
#include <officecfg/Office/Common.hxx>
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index e1aadc00307b..e5b905a81890 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -31,6 +31,7 @@
#include <editeng/lineitem.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/virdev.hxx>
#include "CellLineStyleControl.hxx"
#include "CellBorderStyleControl.hxx"
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index 0fdf65f1f636..5bd9e11c5fae 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
@@ -19,6 +19,7 @@
#include "CellLineStyleValueSet.hxx"
#include <i18nlangtag/mslangid.hxx>
+#include <vcl/event.hxx>
#include <vcl/settings.hxx>
namespace sc { namespace sidebar {
diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx
index a68144bc1b51..9cde13dac181 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.cxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.cxx
@@ -18,6 +18,7 @@
*/
#include "PreviewValueSet.hxx"
+#include <vcl/event.hxx>
#include <vcl/image.hxx>
namespace sd { namespace sidebar {
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index e5d63f757042..370f9bd3706a 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
#include <unotools/historyoptions.hxx>
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx
index e091158a1981..e52cb1b47c24 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX
#include <svtools/table/tablemodel.hxx>
+#include <vcl/image.hxx>
#include <memory>
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 7ea589dc3993..e4e71e894c0a 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -25,6 +25,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <vcl/accessiblefactory.hxx>
+#include <vcl/svapp.hxx>
#include <osl/diagnose.h>
#include <tools/debug.hxx>
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 17bdde5e1caf..a34030701f98 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -35,6 +35,7 @@
#include <vcl/builder.hxx>
#include <vcl/txtattr.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/builderfactory.hxx>
#include <tools/datetime.hxx>
#include <tools/urlobj.hxx>
diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx
index 83bf6c6110f9..81fb9c8b9789 100644
--- a/svtools/source/contnr/foldertree.cxx
+++ b/svtools/source/contnr/foldertree.cxx
@@ -7,12 +7,19 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <comphelper/processfactory.hxx>
#include <svtools/foldertree.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/urlobj.hxx>
+#include <ucbhelper/commandenvironment.hxx>
#include <vcl/dialog.hxx>
+#include <vcl/treelistentry.hxx>
+#include <com/sun/star/task/InteractionHandler.hpp>
#include "contentenumeration.hxx"
#include <bitmaps.hlst>
+using namespace ::com::sun::star::task;
+
FolderTree::FolderTree( vcl::Window* pParent, WinBits nBits )
: SvTreeListBox( pParent, nBits | WB_SORT | WB_TABSTOP )
{
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index 22f2fa25f828..3398ae9a557b 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -18,6 +18,7 @@
*/
#include <svtools/simptabl.hxx>
+#include <unotools/intlwrapper.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/treelistentry.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index 38fe6a9275fb..77fd6ae87c44 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -19,6 +19,7 @@
#include <svtools/accessibleruler.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
#include <unotools/accessiblestatesethelper.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx
index cbaa8ccf655c..fd2f777e84d6 100644
--- a/svtools/source/control/breadcrumb.cxx
+++ b/svtools/source/control/breadcrumb.cxx
@@ -8,6 +8,8 @@
*/
#include <svtools/breadcrumb.hxx>
+#include <tools/urlobj.hxx>
+#include <vcl/fixedhyper.hxx>
class CustomLink : public FixedHyperlink
{
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index d11e5c6b15c1..0fba463c4ff6 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -23,9 +23,12 @@
#include <tools/stream.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/customweld.hxx>
+#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/field.hxx>
#include <vcl/settings.hxx>
+#include <vcl/image.hxx>
+#include <vcl/virdev.hxx>
#include <sal/macros.h>
#include <sal/log.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 81ba9557a79f..a2665e420126 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -26,6 +26,7 @@
#include <osl/diagnose.h>
#include <svtools/svtresid.hxx>
#include <tools/urlobj.hxx>
+#include <vcl/edit.hxx>
#include <vcl/stdtext.hxx>
#include <svtools/strings.hrc>
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index 0552bdb54ea7..9a71c82b7e61 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -20,6 +20,7 @@
#include <svtools/hyperlabel.hxx>
#include <tools/color.hxx>
#include <vcl/bitmap.hxx>
+#include <vcl/event.hxx>
#include <vcl/settings.hxx>
#include <vcl/tabpage.hxx>
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index e9c3bf9e302b..66c4508a9183 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -22,6 +22,7 @@
#include <vector>
#include <algorithm>
#include <vcl/bitmap.hxx>
+#include <vcl/event.hxx>
#include <vcl/settings.hxx>
#include <tools/color.hxx>
#include <rtl/ustring.hxx>
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 91f1e2536017..4168aace293d 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -24,8 +24,11 @@
#include <vcl/event.hxx>
#include <vcl/i18nhelp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/vcllayout.hxx>
+#include <vcl/virdev.hxx>
#include <sal/log.hxx>
+#include <svtools/accessibleruler.hxx>
#include <svtools/ruler.hxx>
#include <svtools/svtresid.hxx>
#include <svtools/strings.hrc>
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 400e10b10f9d..0b92e9081219 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -25,6 +25,7 @@
#include <tools/debug.hxx>
#include <tools/gen.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
using namespace ::std;
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index ec1f941e1c71..df425a888250 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -29,6 +29,7 @@
#include <vcl/settings.hxx>
#include <tools/debug.hxx>
+#include <svtools/framestatuslistener.hxx>
#include <svtools/toolbarmenu.hxx>
#include "toolbarmenuimp.hxx"
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 5b7ca0504d05..c9cfe843220c 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -20,11 +20,13 @@
#include <tools/debug.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/decoview.hxx>
+#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/help.hxx>
#include <vcl/settings.hxx>
#include <vcl/commandevent.hxx>
+#include <vcl/virdev.hxx>
#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index df8f6f46fddb..34f93b949ecc 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <config_oauth2.h>
+
#include <svtools/PlaceEditDialog.hxx>
#include <svtools/ServerDetailsControls.hxx>
@@ -14,6 +16,7 @@
#include <officecfg/Office/Common.hxx>
#include <svtools/svtresid.hxx>
#include <svtools/strings.hrc>
+#include <svtools/place.hxx>
using namespace com::sun::star::uno;
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index f4b406d1300d..3e87457d533c 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -9,6 +9,8 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
+#include <com/sun/star/task/PasswordContainer.hpp>
+#include <com/sun/star/task/XPasswordContainer2.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index d1f52db83759..e6d933ba7867 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -25,6 +25,10 @@
#include <tools/debug.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/string.hxx>
+#include <unotools/configitem.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
+#include <vcl/lstbox.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/settings.hxx>
@@ -32,6 +36,7 @@
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <toolkit/helper/vclunohelper.hxx>
+#include <com/sun/star/util/AliasProgrammaticPair.hpp>
#include <com/sun/star/ui/dialogs/AddressBookSourcePilot.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -49,6 +54,7 @@
#include <tools/urlobj.hxx>
#include <algorithm>
#include <map>
+#include <set>
#include <array>
#include <strings.hxx>
diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx b/svtools/source/filter/DocumentToGraphicRenderer.cxx
index 192d84e7c869..5dbcd9034633 100644
--- a/svtools/source/filter/DocumentToGraphicRenderer.cxx
+++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx
@@ -28,13 +28,16 @@
#include <tools/fract.hxx>
#include <com/sun/star/awt/XDevice.hpp>
+#include <com/sun/star/awt/XToolkit.hpp>
#include <com/sun/star/text/XPageCursor.hpp>
#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
+#include <com/sun/star/view/XRenderable.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 60e831a5b2cb..8ecfd2d64680 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <cppuhelper/implbase.hxx>
+#include <vcl/evntpost.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 39e0fb4bee3a..02cd9fe547ff 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -18,6 +18,7 @@
*/
#include <com/sun/star/embed/XComponentSupplier.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/embed/XVisualObject.hpp>
#include <com/sun/star/embed/XEmbedPersist.hpp>
diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx
index a90b8b81b8f3..c1e67a0fe1f0 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -9,8 +9,10 @@
#include <sal/config.h>
#include <sal/log.hxx>
+#include <osl/file.hxx>
#include <svtools/filechangedchecker.hxx>
+#include <vcl/timer.hxx>
FileChangedChecker::FileChangedChecker(const OUString& rFilename,
const ::std::function<void ()>& rCallback)
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index 4baed7364fd7..61d20c0bbb5a 100644
--- a/svtools/source/misc/openfiledroptargetlistener.cxx
+++ b/svtools/source/misc/openfiledroptargetlistener.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index 4086fc477f79..f562e2000131 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -14,6 +14,7 @@
#include <vcl/fontcharmap.hxx>
#include <i18nutil/unicode.hxx>
#include <sal/log.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
// This should only be used when a commonly used font incorrectly declares its
// coverage. If you add a font here, please leave a note explaining the issue
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index 4f2cb9c8fda4..638902ff108d 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -19,6 +19,8 @@
#include <svtools/unitconv.hxx>
#include <tools/debug.hxx>
+#include <vcl/field.hxx>
+#include <vcl/weld.hxx>
void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll)
{
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index b045394cfb38..d5e17721f108 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -24,6 +24,7 @@
#include <vcl/settings.hxx>
#include <svl/zforlist.hxx>
+#include <svtools/HtmlWriter.hxx>
#include <svtools/htmlout.hxx>
#include <svtools/htmlkywd.hxx>
#include <vcl/imap.hxx>
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index aff066e76c55..dfc13f9ff1b9 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -19,6 +19,7 @@
#include <tools/debug.hxx>
#include <tools/stream.hxx>
+#include <tools/solar.h>
#include <rtl/string.hxx>
#include <rtl/ustrbuf.hxx>
#include <svtools/rtfkeywd.hxx>
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 0b2164ce923d..a9a0f548fa83 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -18,6 +18,7 @@
*/
#include <svtools/svparser.hxx>
+#include <svtools/htmltokn.h>
#include <tools/stream.hxx>
#include <tools/debug.hxx>
#include <rtl/textcvt.h>
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index 8a1f6f028359..59acd82d4789 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -20,6 +20,7 @@
#include "cellvalueconversion.hxx"
#include <table/gridtablerenderer.hxx>
+#include <svtools/table/tablesort.hxx>
#include <svtools/colorcfg.hxx>
#include <com/sun/star/graphic/XGraphic.hpp>
diff --git a/svtools/source/table/mousefunction.cxx b/svtools/source/table/mousefunction.cxx
index 42eb2a45c678..ca9f088ff339 100644
--- a/svtools/source/table/mousefunction.cxx
+++ b/svtools/source/table/mousefunction.cxx
@@ -20,6 +20,7 @@
#include "mousefunction.hxx"
#include <table/tablecontrolinterface.hxx>
+#include <svtools/table/tablesort.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/window.hxx>
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index e2d585642b59..27afba092bac 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -22,6 +22,9 @@
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertysequence.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/util/AliasProgrammaticPair.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <rtl/ref.hxx>
diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index 7fd66df23dcf..d4bcaeacaba1 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/frame/status/ItemStatus.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
#include <vcl/svapp.hxx>
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index d4f0f97f42d1..4e21ff393dba 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -21,6 +21,8 @@
#include <svtools/genericunodialog.hxx>
#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 410e0e78c12f..8bf253442d55 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index c7cb62ac1903..13cb1f99ae99 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -21,9 +21,11 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
+#include <com/sun/star/ui/XStatusbarItem.hpp>
#include <cppuhelper/queryinterface.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
@@ -32,6 +34,7 @@
#include <svtools/miscopt.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
using namespace ::cppu;
using namespace css::awt;
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index af94b13e515d..ce56728cefed 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SVTOOLS_SOURCE_UNO_UNOCONTROLTABLEMODEL_HXX
#include <svtools/table/tablemodel.hxx>
+#include <svtools/table/tablesort.hxx>
#include <table/tablecontrol.hxx>
#include <com/sun/star/awt/grid/XGridControl.hpp>
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 225f044613ea..e5199dcd4e07 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -20,6 +20,7 @@
#include <vcl/builderfactory.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/virdev.hxx>
#include <sfx2/dialoghelper.hxx>
#include <svx/xtable.hxx>
#include <svx/xpool.hxx>
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 1664b93abb20..49284af8a9fa 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -19,6 +19,7 @@
#include <svl/rectitem.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <svx/svxids.hrc>
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 017bc1dfb853..9f9334bfe543 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -31,9 +31,11 @@
#include <editeng/brushitem.hxx>
#include <svl/intitem.hxx>
#include <sfx2/objsh.hxx>
+#include <vcl/event.hxx>
#include <vcl/graph.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
+#include <vcl/virdev.hxx>
#include <editeng/flstitem.hxx>
#include <svx/dlgutil.hxx>
#include <svx/xtable.hxx>
@@ -57,7 +59,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
-using namespace com::sun::star::i18n;
using namespace com::sun::star::text;
using namespace com::sun::star::container;
using namespace com::sun::star::style;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 96c17edfbd12..f8454b647a48 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -24,6 +24,7 @@
#include <vcl/image.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/virdev.hxx>
#include <svl/eitem.hxx>
#include <svl/rectitem.hxx>
#include <svl/hint.hxx>
@@ -37,6 +38,7 @@
#include <editeng/tstpitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/protitem.hxx>
+#include <osl/diagnose.h>
#include <svx/svdtrans.hxx>
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index d79bf4ab08f8..7275f216e38e 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -55,6 +55,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <vcl/unohelp.hxx>
+#include <vcl/svapp.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <sal/macros.h>
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list