tdf#42949 Fix IWYU warnings in sw/source/ui/*/*hxx

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

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

76 files changed, 68 insertions, 117 deletions

diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index 3da4c2bc88d0..75de0880e278 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -20,8 +20,6 @@
 #define INCLUDED_SW_SOURCE_UI_DBUI_CREATEADDRESSLISTDIALOG_HXX
 
 #include <sfx2/basedlgs.hxx>
-#include <vcl/button.hxx>
-#include <vcl/field.hxx>
 #include <vcl/weld.hxx>
 #include <vector>
 
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index 9c32032d13bd..107d7b8554fe 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -22,6 +22,8 @@
 #include <sfx2/basedlgs.hxx>
 #include <vcl/weld.hxx>
 
+#include "createaddresslistdialog.hxx"
+
 struct SwCSVData;
 
 class SwCustomizeAddressListDialog : public SfxDialogController
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index b0d2f25de99e..1eb3dfd14dc3 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_UI_DBUI_DBTABLEPREVIEWDIALOG_HXX
 
 #include <sfx2/basedlgs.hxx>
-#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <com/sun/star/uno/Sequence.h>
 
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index f8d6493e594a..5cdd6c1ad900 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -26,11 +26,6 @@
 #include <sfx2/basedlgs.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/vclmedit.hxx>
-#include <vcl/headbar.hxx>
-#include <vcl/transfer.hxx>
-#include <vcl/treelistbox.hxx>
-#include <vcl/combobox.hxx>
 #include <svl/lstner.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index eb94f9583006..ae1a6e23588f 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_UI_DBUI_MMDOCSELECTPAGE_HXX
 
 #include <svtools/wizardmachine.hxx>
-#include <mailmergehelper.hxx>
 #include <vcl/weld.hxx>
 
 class SwMailMergeWizard;
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index 9a1dd59e475d..68ef6d9927cd 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -24,6 +24,8 @@
 #include <mailmergehelper.hxx>
 #include <vcl/weld.hxx>
 
+#include <mailmergewizard.hxx>
+
 class SwMailMergeWizard;
 
 class SwGreetingsHandler
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 591eadd8623b..0cc58b285407 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -21,10 +21,6 @@
 
 #include <svtools/wizardmachine.hxx>
 #include <mailmergehelper.hxx>
-#include <vcl/button.hxx>
-#include <vcl/field.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
 #include <com/sun/star/uno/Reference.h>
 
 class SwMailMergeWizard;
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index 258a2a03695c..20e43ab69060 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -21,7 +21,6 @@
 
 #include <svtools/wizardmachine.hxx>
 #include <vcl/weld.hxx>
-#include <mailmergehelper.hxx>
 class SwMailMergeWizard;
 
 class SwMailMergeOutputTypePage : public svt::OWizardPage
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 9d07b650c989..d149f5ce9e5b 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -21,6 +21,39 @@
 
 #include <swabstdlg.hxx>
 
+#include <abstract.hxx>
+#include <ascfldlg.hxx>
+#include <break.hxx>
+#include <cnttab.hxx>
+#include <colwd.hxx>
+#include <convert.hxx>
+#include <DateFormFieldDialog.hxx>
+#include <dbinsdlg.hxx>
+#include <DropDownFieldDialog.hxx>
+#include <DropDownFormFieldDialog.hxx>
+#include <fldtdlg.hxx>
+#include <glossary.hxx>
+#include <inpdlg.hxx>
+#include <insfnote.hxx>
+#include <instable.hxx>
+#include <javaedit.hxx>
+#include <label.hxx>
+#include <mailmergewizard.hxx>
+#include <mailmrge.hxx>
+#include <mergetbl.hxx>
+#include <multmrk.hxx>
+#include <regionsw.hxx>
+#include <rowht.hxx>
+#include <selglos.hxx>
+#include <splittbl.hxx>
+#include <srtdlg.hxx>
+#include <swmodalredlineacceptdlg.hxx>
+#include <swrenamexnameddlg.hxx>
+#include <swuicnttab.hxx>
+#include <swuiidxmrk.hxx>
+#include <tautofmt.hxx>
+#include <wordcountdialog.hxx>
+
 class SwInsertAbstractDlg;
 class SwAsciiFilterDlg;
 class Dialog;
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index a8c093c381fe..6e5e7d9ea8c6 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SW_SOURCE_UI_ENVELP_ENVPRT_HXX
 
 #include <sfx2/tabdlg.hxx>
+#include <vcl/print.hxx>
 #include <vcl/weld.hxx>
 
 #include <envimg.hxx>
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 56bdc3b33e56..44e3345668f6 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -27,6 +27,7 @@
 #include <wrtsh.hxx>
 #include <initui.hxx>
 #include <labimp.hxx>
+#include "swuilabimp.hxx"
 #include "labfmt.hxx"
 #include "labprt.hxx"
 #include <unotools.hxx>
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 57d3a2912004..7f2d9ece02ba 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -20,6 +20,7 @@
 #include <svtools/unitconv.hxx>
 #include <tools/poly.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <sal/log.hxx>
 
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 5a7258f7e73a..208b1bc1ac28 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -19,8 +19,10 @@
 #ifndef INCLUDED_SW_SOURCE_UI_ENVELP_LABFMT_HXX
 #define INCLUDED_SW_SOURCE_UI_ENVELP_LABFMT_HXX
 
-#include "swuilabimp.hxx"
 #include <labimg.hxx>
+#include <label.hxx>
+
+#include <sfx2/tabdlg.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 7785bcf21049..f253653d3d1c 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -21,6 +21,8 @@
 
 #include <sfx2/tabdlg.hxx>
 
+#include <label.hxx>
+
 class SwLabDlg;
 class SwLabItem;
 
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index ccdd6a476267..f426694db434 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -21,11 +21,8 @@
 
 #include <label.hxx>
 #include <labimg.hxx>
-#include <labimp.hxx>
 #include <labrec.hxx>
-#include <com/sun/star/text/XAutoTextContainer2.hpp>
 #include <sfx2/tabdlg.hxx>
-#include <vcl/layout.hxx>
 
 class SwLabPage : public SfxTabPage
 {
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index c1ae1b8e5768..e1a8207a7e3e 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -19,10 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UI_FLDUI_FLDDB_HXX
 #define INCLUDED_SW_SOURCE_UI_FLDUI_FLDDB_HXX
 
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
-
 #include <condedit.hxx>
 #include <dbtree.hxx>
 #include <numfmtlb.hxx>
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 8ee99cf74b27..88a7b3ecbee7 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -20,11 +20,6 @@
 #define INCLUDED_SW_SOURCE_UI_FLDUI_FLDDOK_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/field.hxx>
 
 #include <numfmtlb.hxx>
 #include "fldpage.hxx"
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index d10fb72382a7..24a1264ef7b6 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -20,14 +20,9 @@
 #define INCLUDED_SW_SOURCE_UI_FLDUI_FLDFUNC_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
-#include <vcl/edit.hxx>
 
 #include <condedit.hxx>
 #include "fldpage.hxx"
-#include <actctrl.hxx>
 
 class SwFieldFuncPage : public SwFieldPage
 {
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index eacf917b5bb5..9add08a354a1 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -20,10 +20,6 @@
 #define INCLUDED_SW_SOURCE_UI_FLDUI_FLDREF_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
-#include <vcl/edit.hxx>
 
 #include "fldpage.hxx"
 #include <IDocumentOutlineNodes.hxx>
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 5838e2f96b00..323e01ef2b58 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -20,11 +20,6 @@
 #define INCLUDED_SW_SOURCE_UI_FLDUI_FLDVAR_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/edit.hxx>
 
 #include "fldpage.hxx"
 #include <condedit.hxx>
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index a0e1346ceb80..d6ef4477ffe5 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -18,16 +18,12 @@
  */
 #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTPAGE_HXX
 #define INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTPAGE_HXX
-#include <svtools/wizardmachine.hxx>
+
 #include <vcl/button.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/field.hxx>
 #include <vcl/prgsbar.hxx>
 #include <vcl/weld.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <svtools/simptabl.hxx>
-#include <vcl/svtabbx.hxx>
 #include <vcl/headbar.hxx>
 #include <mailmergehelper.hxx>
 
diff --git a/sw/source/ui/inc/swuiexp.hxx b/sw/source/ui/inc/swuiexp.hxx
index 226127c5e595..4419a7029549 100644
--- a/sw/source/ui/inc/swuiexp.hxx
+++ b/sw/source/ui/inc/swuiexp.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_UI_INC_SWUIEXP_HXX
 #define INCLUDED_SW_SOURCE_UI_INC_SWUIEXP_HXX
 
+#include <swabstdlg.hxx>
+
 namespace swui
 {
     SwAbstractDialogFactory& GetFactory();
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index be826eb83f33..c99b2e6e369b 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -22,6 +22,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <sfx2/docfile.hxx>
 #include <sot/storage.hxx>
 #include <unotools/mediadescriptor.hxx>
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index e861b598c24b..ce410c97aced 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -19,18 +19,11 @@
 #ifndef INCLUDED_SW_SOURCE_UI_UNO_SWDETECT_HXX
 #define INCLUDED_SW_SOURCE_UI_UNO_SWDETECT_HXX
 
-#include <tools/solar.h>
 #include <rtl/ustring.hxx>
-#include <osl/diagnose.h>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#include <com/sun/star/uno/Exception.hpp>
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <cppuhelper/factory.hxx>
-
-#include <sfx2/sfxuno.hxx>
 
 namespace com
 {
diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx
index 017014ef6f32..67a9edb3c998 100644
--- a/sw/source/ui/vba/vbaaddins.hxx
+++ b/sw/source/ui/vba/vbaaddins.hxx
@@ -21,7 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XAddins.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 
 typedef CollTestImplHelper< ooo::vba::word::XAddins > SwVbaAddins_BASE;
 
diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx
index 2b566ad94c82..62fd3dfaf75e 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -29,8 +29,6 @@
 #include <ooo/vba/word/XSystem.hpp>
 #include <ooo/vba/word/XOptions.hpp>
 #include <ooo/vba/word/XSelection.hpp>
-#include <ooo/vba/word/XAddins.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbaapplicationbase.hxx>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx
index ae66a1d9f060..af8d211fa439 100644
--- a/sw/source/ui/vba/vbabookmark.cxx
+++ b/sw/source/ui/vba/vbabookmark.cxx
@@ -19,6 +19,7 @@
 #include "vbabookmark.hxx"
 #include <vbahelper/vbahelper.hxx>
 #include <tools/diagnose_ex.h>
+#include <com/sun/star/text/XBookmarksSupplier.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx
index 33922b45aad6..e6130fc5158d 100644
--- a/sw/source/ui/vba/vbabookmark.hxx
+++ b/sw/source/ui/vba/vbabookmark.hxx
@@ -21,7 +21,6 @@
 
 #include <ooo/vba/word/XBookmark.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
-#include <com/sun/star/text/XBookmarksSupplier.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XBookmark > SwVbaBookmark_BASE;
diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx
index 4035b6010316..546679bbf3c0 100644
--- a/sw/source/ui/vba/vbabookmarks.hxx
+++ b/sw/source/ui/vba/vbabookmarks.hxx
@@ -21,12 +21,9 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XBookmarks.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XBookmarksSupplier.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/text/XText.hpp>
 
 typedef CollTestImplHelper< ooo::vba::word::XBookmarks > SwVbaBookmarks_BASE;
 
diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx
index 5dac59e3f1f7..7438117479b5 100644
--- a/sw/source/ui/vba/vbacells.hxx
+++ b/sw/source/ui/vba/vbacells.hxx
@@ -21,7 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XCells.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XTextTable.hpp>
 
 typedef CollTestImplHelper< ooo::vba::word::XCells > SwVbaCells_BASE;
diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx
index d2eaefbbff06..3e865d60808f 100644
--- a/sw/source/ui/vba/vbacolumn.hxx
+++ b/sw/source/ui/vba/vbacolumn.hxx
@@ -21,9 +21,7 @@
 
 #include <ooo/vba/word/XColumn.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
-#include <com/sun/star/table/XTableColumns.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
-#include <com/sun/star/text/TableColumnSeparator.hpp>
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XColumn > SwVbaColumn_BASE;
 
diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx
index d4b957fd53f5..8cacef23ff43 100644
--- a/sw/source/ui/vba/vbacolumns.hxx
+++ b/sw/source/ui/vba/vbacolumns.hxx
@@ -22,7 +22,6 @@
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XColumns.hpp>
 #include <ooo/vba/word/XColumn.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/table/XTableColumns.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 
diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx
index ef961d2e0cf0..df4443446f63 100644
--- a/sw/source/ui/vba/vbadialog.hxx
+++ b/sw/source/ui/vba/vbadialog.hxx
@@ -21,7 +21,6 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <ooo/vba/word/XDialog.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbadialogbase.hxx>
 
 typedef cppu::ImplInheritanceHelper< VbaDialogBase, ov::word::XDialog > SwVbaDialog_BASE;
diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx
index 0c9400e4d65b..3703868f1be4 100644
--- a/sw/source/ui/vba/vbadialogs.hxx
+++ b/sw/source/ui/vba/vbadialogs.hxx
@@ -21,8 +21,6 @@
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <ooo/vba/word/XDialogs.hpp>
-#include <ooo/vba/XCollection.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbadialogsbase.hxx>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx
index af4c93f32f95..2bc6dbb0ffc0 100644
--- a/sw/source/ui/vba/vbadocument.hxx
+++ b/sw/source/ui/vba/vbadocument.hxx
@@ -22,7 +22,6 @@
 #include <ooo/vba/XSink.hpp>
 #include <ooo/vba/XSinkCaller.hpp>
 #include <ooo/vba/word/XDocument.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbadocumentbase.hxx>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <cppuhelper/implbase.hxx>
diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx
index d72b1a168486..2b6261adbaf5 100644
--- a/sw/source/ui/vba/vbadocuments.hxx
+++ b/sw/source/ui/vba/vbadocuments.hxx
@@ -19,12 +19,9 @@
 #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX
 #define INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX
 
-#include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XDocuments.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <vbahelper/vbadocumentsbase.hxx>
 #include <cppuhelper/implbase.hxx>
-#include "wordvbahelper.hxx"
 
 typedef cppu::ImplInheritanceHelper< VbaDocumentsBase, ov::word::XDocuments > SwVbaDocuments_BASE;
 
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index b7024251267a..49371d794b05 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -18,6 +18,7 @@
  */
 #include "vbafield.hxx"
 #include "vbarange.hxx"
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx
index 370ceaec3931..292be2edb7f9 100644
--- a/sw/source/ui/vba/vbafield.hxx
+++ b/sw/source/ui/vba/vbafield.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_UI_VBA_VBAFIELD_HXX
 #include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextField.hpp>
 #include <ooo/vba/word/XField.hpp>
 #include <ooo/vba/word/XFields.hpp>
diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx
index 54c712a86dea..cdbcc95538f7 100644
--- a/sw/source/ui/vba/vbafind.hxx
+++ b/sw/source/ui/vba/vbafind.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/util/XReplaceable.hpp>
 #include <com/sun/star/util/XPropertyReplace.hpp>
 #include <com/sun/star/text/XTextViewCursor.hpp>
-#include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XFind > SwVbaFind_BASE;
diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx
index c0af24f825d5..e83f411b1da5 100644
--- a/sw/source/ui/vba/vbaframes.hxx
+++ b/sw/source/ui/vba/vbaframes.hxx
@@ -21,7 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XFrames.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XTextFramesSupplier.hpp>
 
 typedef CollTestImplHelper< ooo::vba::word::XFrames > SwVbaFrames_BASE;
diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx
index 2674112af21f..23e40c45d962 100644
--- a/sw/source/ui/vba/vbaglobals.hxx
+++ b/sw/source/ui/vba/vbaglobals.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBAGLOBALS_HXX
 #define INCLUDED_SW_SOURCE_UI_VBA_VBAGLOBALS_HXX
 
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <ooo/vba/word/XGlobals.hpp>
 #include <ooo/vba/word/XApplication.hpp>
@@ -28,7 +26,6 @@
 #include <ooo/vba/word/XOptions.hpp>
 #include <ooo/vba/word/XSelection.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbaglobalbase.hxx>
 
 typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE;
diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx
index d33f5a65572b..477b03564b95 100644
--- a/sw/source/ui/vba/vbaheaderfooter.cxx
+++ b/sw/source/ui/vba/vbaheaderfooter.cxx
@@ -20,6 +20,7 @@
 #include <vbahelper/vbahelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <ooo/vba/word/WdHeaderFooterIndex.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
index 6fb59960b98c..8dd48c8f2f36 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
+#include <com/sun/star/text/XPageCursor.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.hxx b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
index aca71c8196c3..ed3c5d2d9d21 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.hxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
@@ -21,9 +21,6 @@
 
 #include <vbahelper/vbahelper.hxx>
 #include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/XTextViewCursor.hpp>
-#include <com/sun/star/text/XPageCursor.hpp>
-#include <com/sun/star/style/XStyle.hpp>
 
 class HeaderFooterHelper
 {
diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx
index b836d1b5a5c5..3c6336d35ad0 100644
--- a/sw/source/ui/vba/vbaheadersfooters.hxx
+++ b/sw/source/ui/vba/vbaheadersfooters.hxx
@@ -21,7 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XHeadersFooters.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 
 typedef CollTestImplHelper< ooo::vba::word::XHeadersFooters > SwVbaHeadersFooters_BASE;
 
diff --git a/sw/source/ui/vba/vbainformationhelper.hxx b/sw/source/ui/vba/vbainformationhelper.hxx
index 0424a958e019..01e5500bab86 100644
--- a/sw/source/ui/vba/vbainformationhelper.hxx
+++ b/sw/source/ui/vba/vbainformationhelper.hxx
@@ -19,9 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBAINFORMATIONHELPER_HXX
 #define INCLUDED_SW_SOURCE_UI_VBA_VBAINFORMATIONHELPER_HXX
 
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XTextViewCursor.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 
 class SwVbaInformationHelper
 {
diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx
index e5b5d4fbeef8..273c67fe5218 100644
--- a/sw/source/ui/vba/vbalistformat.hxx
+++ b/sw/source/ui/vba/vbalistformat.hxx
@@ -23,7 +23,6 @@
 #include <ooo/vba/word/XListTemplate.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XTextRange.hpp>
-#include "vbalisthelper.hxx"
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XListFormat > SwVbaListFormat_BASE;
 
diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx
index 7cbf653a4d97..57cfc9d9809c 100644
--- a/sw/source/ui/vba/vbalistgalleries.hxx
+++ b/sw/source/ui/vba/vbalistgalleries.hxx
@@ -21,7 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XListGalleries.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XTextDocument.hpp>
 
 typedef CollTestImplHelper< ooo::vba::word::XListGalleries > SwVbaListGalleries_BASE;
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index e1284240e4e0..1bc73773ac2c 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "vbalisthelper.hxx"
+#include <vbahelper/vbahelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 #include <ooo/vba/word/WdListGalleryType.hpp>
diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx
index f68df37e25e6..f076692d1740 100644
--- a/sw/source/ui/vba/vbalisthelper.hxx
+++ b/sw/source/ui/vba/vbalisthelper.hxx
@@ -9,11 +9,13 @@
 #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBALISTHELPER_HXX
 #define INCLUDED_SW_SOURCE_UI_VBA_VBALISTHELPER_HXX
 
-#include <vbahelper/vbahelperinterface.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 
+#include <memory>
+
 class SwVbaListHelper;
 typedef std::shared_ptr< SwVbaListHelper > SwVbaListHelperRef;
 
diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx
index 47cb9d774729..f9f5e030e56e 100644
--- a/sw/source/ui/vba/vbalistlevel.hxx
+++ b/sw/source/ui/vba/vbalistlevel.hxx
@@ -21,7 +21,6 @@
 
 #include <ooo/vba/word/XListLevel.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
-#include <com/sun/star/text/XTextDocument.hpp>
 #include "vbalisthelper.hxx"
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XListLevel > SwVbaListLevel_BASE;
diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx
index 874529fd1878..f3a212b2c9c8 100644
--- a/sw/source/ui/vba/vbalistlevels.hxx
+++ b/sw/source/ui/vba/vbalistlevels.hxx
@@ -21,7 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XListLevels.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include "vbalisthelper.hxx"
 
 typedef CollTestImplHelper< ooo::vba::word::XListLevels > SwVbaListLevels_BASE;
diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx
index 31592cd9d042..270e2cc09d4f 100644
--- a/sw/source/ui/vba/vbalisttemplates.hxx
+++ b/sw/source/ui/vba/vbalisttemplates.hxx
@@ -21,7 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XListTemplates.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XTextDocument.hpp>
 
 typedef CollTestImplHelper< ooo::vba::word::XListTemplates > SwVbaListTemplates_BASE;
diff --git a/sw/source/ui/vba/vbapalette.hxx b/sw/source/ui/vba/vbapalette.hxx
index 989415c7f8cb..cbf639301f2c 100644
--- a/sw/source/ui/vba/vbapalette.hxx
+++ b/sw/source/ui/vba/vbapalette.hxx
@@ -19,7 +19,7 @@
 
 #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBAPALETTE_HXX
 #define INCLUDED_SW_SOURCE_UI_VBA_VBAPALETTE_HXX
-#include <vbahelper/vbahelper.hxx>
+
 #include <com/sun/star/container/XIndexAccess.hpp>
 
 class VbaPalette
diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx
index cfbc15330d66..da09790d7546 100644
--- a/sw/source/ui/vba/vbapanes.hxx
+++ b/sw/source/ui/vba/vbapanes.hxx
@@ -21,9 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XPanes.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 
 typedef CollTestImplHelper< ooo::vba::word::XPanes > SwVbaPanes_BASE;
 
diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx
index 1508df7505c5..0b9b02b54ec6 100644
--- a/sw/source/ui/vba/vbaparagraphformat.hxx
+++ b/sw/source/ui/vba/vbaparagraphformat.hxx
@@ -21,7 +21,6 @@
 
 #include <ooo/vba/word/XParagraphFormat.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
-#include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index cc7ad8570204..bf9dde5cca12 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 #include <com/sun/star/text/XWordCursor.hpp>
 #include <com/sun/star/text/XParagraphCursor.hpp>
+#include <com/sun/star/text/XTextViewCursor.hpp>
 #include <ooo/vba/word/WdUnits.hpp>
 #include <ooo/vba/word/WdMovementType.hpp>
 #include "vbaparagraphformat.hxx"
@@ -41,6 +42,7 @@
 #include "vbabookmarks.hxx"
 #include "vbasections.hxx"
 #include "vbafield.hxx"
+#include "wordvbahelper.hxx"
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx
index d5ca830ff6aa..d311c25a70c9 100644
--- a/sw/source/ui/vba/vbarange.hxx
+++ b/sw/source/ui/vba/vbarange.hxx
@@ -25,9 +25,7 @@
 #include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
-#include <ooo/vba/word/XStyle.hpp>
 #include <ooo/vba/word/XListFormat.hpp>
-#include "wordvbahelper.hxx"
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XRange > SwVbaRange_BASE;
 
diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx
index db299585fbb2..3812fbfa00da 100644
--- a/sw/source/ui/vba/vbarangehelper.cxx
+++ b/sw/source/ui/vba/vbarangehelper.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "vbarangehelper.hxx"
+#include <vbahelper/vbahelper.hxx>
 #include <com/sun/star/text/ControlCharacter.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 #include <com/sun/star/text/XBookmarksSupplier.hpp>
diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx
index 5d91af3c8c02..7ea5ed5792c2 100644
--- a/sw/source/ui/vba/vbarangehelper.hxx
+++ b/sw/source/ui/vba/vbarangehelper.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBARANGEHELPER_HXX
 #define INCLUDED_SW_SOURCE_UI_VBA_VBARANGEHELPER_HXX
 
-#include <vbahelper/vbahelperinterface.hxx>
-#include <com/sun/star/text/XTextViewCursor.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx
index aedc7ae0ae45..7925706f2fc1 100644
--- a/sw/source/ui/vba/vbarevision.cxx
+++ b/sw/source/ui/vba/vbarevision.cxx
@@ -21,6 +21,7 @@
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 #include <com/sun/star/document/XRedlinesSupplier.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
 #include "wordvbahelper.hxx"
 #include <docsh.hxx>
 #include <doc.hxx>
diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx
index 2dec38640cb3..7cf2f54a5860 100644
--- a/sw/source/ui/vba/vbarevisions.hxx
+++ b/sw/source/ui/vba/vbarevisions.hxx
@@ -21,7 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XRevisions.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XTextRange.hpp>
 
 typedef CollTestImplHelper< ooo::vba::word::XRevisions > SwVbaRevisions_BASE;
diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx
index 96073d51b082..54e76ec920f3 100644
--- a/sw/source/ui/vba/vbarows.hxx
+++ b/sw/source/ui/vba/vbarows.hxx
@@ -22,7 +22,6 @@
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XRows.hpp>
 #include <ooo/vba/word/XColumns.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/table/XTableRows.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 
diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx
index e793ecbe7b7c..3bf3ab4ca3e5 100644
--- a/sw/source/ui/vba/vbasections.hxx
+++ b/sw/source/ui/vba/vbasections.hxx
@@ -21,10 +21,7 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XSections.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 
 typedef CollTestImplHelper< ooo::vba::word::XSections > SwVbaSections_BASE;
 
diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx
index fc995c150921..7c86753d9340 100644
--- a/sw/source/ui/vba/vbaselection.hxx
+++ b/sw/source/ui/vba/vbaselection.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/text/XTextTable.hpp>
 #include <ooo/vba/word/XParagraphFormat.hpp>
 #include <ooo/vba/word/XFind.hpp>
-#include <ooo/vba/word/XStyle.hpp>
 #include <ooo/vba/word/XFont.hpp>
 #include <ooo/vba/word/XHeaderFooter.hpp>
 #include "wordvbahelper.hxx"
diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx
index d00ba941a4d1..159b9ebf6220 100644
--- a/sw/source/ui/vba/vbastyle.hxx
+++ b/sw/source/ui/vba/vbastyle.hxx
@@ -24,10 +24,8 @@
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <ooo/vba/word/XFont.hpp>
-#include <ooo/vba/word/XListTemplate.hpp>
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XStyle > SwVbaStyle_BASE;
 
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 406e92cc536c..b003ca81517e 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -16,6 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+#include <vbahelper/vbahelper.hxx>
 #include "vbatablehelper.hxx"
 #include <swtable.hxx>
 #include <unotbl.hxx>
diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx
index c569a64ae06d..078673d5e6e8 100644
--- a/sw/source/ui/vba/vbatablehelper.hxx
+++ b/sw/source/ui/vba/vbatablehelper.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_UI_VBA_VBATABLEHELPER_HXX
 
 #include <com/sun/star/text/XTextTable.hpp>
-#include "wordvbahelper.hxx"
 #include <swtable.hxx>
 #include <tabcol.hxx>
 
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index 2d51a959e76f..2efbe29ca4f3 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -20,6 +20,7 @@
 #include "vbatables.hxx"
 #include "vbatable.hxx"
 #include "vbarange.hxx"
+#include "wordvbahelper.hxx"
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index 892094bf0664..ffc9503db46b 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -19,6 +19,7 @@
 #include "vbatablesofcontents.hxx"
 #include "vbatableofcontents.hxx"
 #include "vbarange.hxx"
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XDocumentIndexesSupplier.hpp>
 #include <cppuhelper/implbase.hxx>
diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx
index 1a8199fa990a..37048ae1bcaf 100644
--- a/sw/source/ui/vba/vbatablesofcontents.hxx
+++ b/sw/source/ui/vba/vbatablesofcontents.hxx
@@ -21,7 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XTablesOfContents.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <ooo/vba/word/XTableOfContents.hpp>
 #include <ooo/vba/word/XRange.hpp>
diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx
index 5bb1d439cccd..66a163d4923f 100644
--- a/sw/source/ui/vba/vbatabstops.hxx
+++ b/sw/source/ui/vba/vbatabstops.hxx
@@ -22,9 +22,6 @@
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XTabStops.hpp>
 #include <ooo/vba/word/XTabStop.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 
 typedef CollTestImplHelper< ooo::vba::word::XTabStops > SwVbaTabStops_BASE;
 
diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx
index aa2901d0e479..639c54a33e79 100644
--- a/sw/source/ui/vba/vbavariables.hxx
+++ b/sw/source/ui/vba/vbavariables.hxx
@@ -21,9 +21,6 @@
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XVariables.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 
 typedef CollTestImplHelper< ooo::vba::word::XVariables > SwVbaVariables_BASE;
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index 3fb6c9d71656..ed8fc3a8565c 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XFootnotesSupplier.hpp>
 #include <com/sun/star/text/XEndnotesSupplier.hpp>
+#include <com/sun/star/text/XPageCursor.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx
index bee0c957948b..9921fb3c3763 100644
--- a/sw/source/ui/vba/vbaview.hxx
+++ b/sw/source/ui/vba/vbaview.hxx
@@ -23,7 +23,6 @@
 #include <vbahelper/vbahelperinterface.hxx>
 #include <com/sun/star/text/XTextViewCursor.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XView > SwVbaView_BASE;
diff --git a/sw/source/ui/vba/wordvbahelper.hxx b/sw/source/ui/vba/wordvbahelper.hxx
index b859285ae1f1..d0ac9e43ff17 100644
--- a/sw/source/ui/vba/wordvbahelper.hxx
+++ b/sw/source/ui/vba/wordvbahelper.hxx
@@ -22,9 +22,7 @@
 #include <vbahelper/vbahelper.hxx>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextViewCursor.hpp>
-#include <com/sun/star/text/XPageCursor.hpp>
 #include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 class SwDocShell;