tdf#42949 Fix IWYU warnings in sw/source/uibase/inc/[a-j]*
New IWYU and recent developments in f-u-i helped to identify
some non self contained files, those were fixed too.
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I4b7209de739c164be1cfce360f43a1885867a12a
Reviewed-on: https://gerrit.libreoffice.org/74910
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index d09783c..471d726 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -57,6 +57,10 @@
#include <editeng/eeitem.hxx>
#include <editeng/scripttypeitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/opaqitem.hxx>
#include <editeng/protitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/rsiditem.hxx>
#include <i18nutil/transliteration.hxx>
@@ -71,6 +75,7 @@
#include <unofldmid.h>
#include <UndoManager.hxx>
#include <textsh.hxx>
#include <frmatr.hxx>
#include <frmmgr.hxx>
#include <tblafmt.hxx>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index db8f40f..752d282 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -35,8 +35,10 @@
#include <sfx2/dialoghelper.hxx>
#include <sfx2/htmlmode.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/printer.hxx>
#include <svtools/unitconv.hxx>
#include <vcl/print.hxx>
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <editeng/scripttypeitem.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index b3c9a6c..ff02fca 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -48,6 +48,7 @@
#include <swundo.hxx>
#include <column.hxx>
#include <fmtfsize.hxx>
#include <frmatr.hxx>
#include <shellio.hxx>
#include <cmdid.h>
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 9690c0b..6e12124 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -35,6 +35,7 @@
#include <editeng/lrspitem.hxx>
#include <editeng/sizeitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/ulspitem.hxx>
#include <svl/ctloptions.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
@@ -52,7 +53,9 @@
#include <uitool.hxx>
#include <cmdid.h>
#include <viewopt.hxx>
#include <fmtclbl.hxx>
#include <format.hxx>
#include <frmatr.hxx>
#include <frmmgr.hxx>
#include <frmdlg.hxx>
#include <colmgr.hxx>
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index d904ff0..e012352 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -35,6 +35,7 @@
#include <editeng/brushitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <svx/swframeposstrings.hxx>
#include <svx/swframevalidation.hxx>
#include <comphelper/classids.hxx>
#include <sfx2/viewfrm.hxx>
@@ -42,6 +43,7 @@
#include <fmturl.hxx>
#include <fmteiro.hxx>
#include <fmtcnct.hxx>
#include <fmtsrnd.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index c02e942..14dbad2 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -37,6 +37,7 @@
#include <wrtsh.hxx>
#include <swmodule.hxx>
#include <viewopt.hxx>
#include <fmtsrnd.hxx>
#include <frmatr.hxx>
#include <frmmgr.hxx>
#include <globals.hrc>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index b4b37b2..ac2a4d7 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -41,6 +41,7 @@
#include <editeng/unolingu.hxx>
#include <swtypes.hxx>
#include <idxmrk.hxx>
#include <toxmgr.hxx>
#include <txttxmrk.hxx>
#include <wrtsh.hxx>
#include <view.hxx>
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 089c34c..6c03c21 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -32,6 +32,7 @@
#include <bookmark.hxx>
#include <docsh.hxx>
#include <globals.hrc>
#include <ndtxt.hxx>
#include <strings.hrc>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx
index 73b8b52..1b7deba 100644
--- a/sw/source/uibase/config/fontcfg.cxx
+++ b/sw/source/uibase/config/fontcfg.cxx
@@ -19,6 +19,7 @@
#include <fontcfg.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <osl/diagnose.h>
#include <vcl/outdev.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/lingucfg.hxx>
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 2409f7b..bdb9e7d 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -27,6 +27,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
#include <svl/urihelper.hxx>
#include <svx/langbox.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <poolfmt.hxx>
#include <fmtcol.hxx>
diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx
index 57f8ded..b0d1364 100644
--- a/sw/source/uibase/inc/DashedLine.hxx
+++ b/sw/source/uibase/inc/DashedLine.hxx
@@ -9,7 +9,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DASHEDLINE_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_DASHEDLINE_HXX
#include <basegfx/color/bcolor.hxx>
#include <vcl/fixed.hxx>
/** Class for displaying a dashed line in the Writer GUI.
diff --git a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx
index 6973576..ae1e1b5 100644
--- a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx
+++ b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx
@@ -11,7 +11,6 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_DROPDOWNFORMFIELDDIALOG_HXX
#include <vcl/weld.hxx>
#include "actctrl.hxx"
namespace sw
{
diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx
index dc076f8..d79ba70 100644
--- a/sw/source/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/uibase/inc/HeaderFooterWin.hxx
@@ -9,6 +9,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_HEADERFOOTERWIN_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_HEADERFOOTERWIN_HXX
#include "edtwin.hxx"
#include "FrameControl.hxx"
#include <vcl/builder.hxx>
#include <vcl/menubtn.hxx>
diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx
index e31f2e2..663972c 100644
--- a/sw/source/uibase/inc/ascfldlg.hxx
+++ b/sw/source/uibase/inc/ascfldlg.hxx
@@ -18,9 +18,7 @@
*/
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ASCFLDLG_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_ASCFLDLG_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <sfx2/basedlgs.hxx>
#include <svx/txencbox.hxx>
#include <svx/langbox.hxx>
diff --git a/sw/source/uibase/inc/autoformatpreview.hxx b/sw/source/uibase/inc/autoformatpreview.hxx
index bf840d2..a5f41e4 100644
--- a/sw/source/uibase/inc/autoformatpreview.hxx
+++ b/sw/source/uibase/inc/autoformatpreview.hxx
@@ -24,12 +24,7 @@
#include <svx/framelinkarray.hxx>
#include <svl/zforlist.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <rtl/ustring.hxx>
#include <vcl/outdev.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/virdev.hxx>
#include <vcl/weld.hxx>
#include <vcl/customweld.hxx>
#include <vcl/font.hxx>
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 41efce2..b442613 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -22,10 +22,8 @@
#include <shellid.hxx>
#include <tools/link.hxx>
#include <vcl/timer.hxx>
#include <sfx2/module.hxx>
#include <sfx2/shell.hxx>
#include <viewopt.hxx>
#include <mdiexp.hxx>
#include <set>
diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx
index 8f51602..e583252 100644
--- a/sw/source/uibase/inc/bookmark.hxx
+++ b/sw/source/uibase/inc/bookmark.hxx
@@ -19,10 +19,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BOOKMARK_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_BOOKMARK_HXX
#include <svtools/simptabl.hxx>
#include <sfx2/basedlgs.hxx>
#include <vcl/weld.hxx>
#include <ndtxt.hxx>
#include <pam.hxx>
#include <IMark.hxx>
#include "condedit.hxx"
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index 66946df..a31dd2b 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CFGITEMS_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_CFGITEMS_HXX
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
#include <swdllapi.h>
#include <printdata.hxx>
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index 4e79109..9e5e132 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -19,11 +19,9 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CNTTAB_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_CNTTAB_HXX
#include <sfx2/tabdlg.hxx>
#include <sal/types.h>
#include <tox.hxx>
#include "toxmgr.hxx"
#include <svx/langbox.hxx>
#include <toxe.hxx>
#define TOX_PAGE_SELECT 1
#define TOX_PAGE_ENTRY 2
diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx
index faf1d95..b755186 100644
--- a/sw/source/uibase/inc/colex.hxx
+++ b/sw/source/uibase/inc/colex.hxx
@@ -24,7 +24,6 @@
#include <swdllapi.h>
#include <tgrditem.hxx>
#include <fmtclds.hxx>
#include <frmatr.hxx>
class SwColMgr;
class SfxItemSet;
diff --git a/sw/source/uibase/inc/colmgr.hxx b/sw/source/uibase/inc/colmgr.hxx
index fa374f5..928e1dc 100644
--- a/sw/source/uibase/inc/colmgr.hxx
+++ b/sw/source/uibase/inc/colmgr.hxx
@@ -22,6 +22,8 @@
#include <swdllapi.h>
#include <fmtclds.hxx>
#include <climits>
SW_DLLPUBLIC void FitToActualSize(SwFormatCol& rCol, sal_uInt16 nWidth);
class SW_DLLPUBLIC SwColMgr
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 55590a1..427c802 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -20,14 +20,12 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_COLUMN_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_COLUMN_HXX
#include <vcl/timer.hxx>
#include <svtools/ctrlbox.hxx>
#include <svtools/valueset.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/colorbox.hxx>
#include <svx/frmdirlbox.hxx>
#include <fmtclbl.hxx>
#include "colex.hxx"
#include "prcntfld.hxx"
diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx
index 6e2b885..974fecf 100644
--- a/sw/source/uibase/inc/condedit.hxx
+++ b/sw/source/uibase/inc/condedit.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONDEDIT_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_CONDEDIT_HXX
#include <vcl/edit.hxx>
#include <vcl/transfer.hxx>
#include <vcl/weld.hxx>
#include <swdllapi.h>
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index d141a2a..ae4c3df 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -19,10 +19,9 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONTENT_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_CONTENT_HXX
#include <memory>
#include <limits.h>
#include "swcont.hxx"
#include <vcl/menu.hxx>
#include <ndarr.hxx>
class SwWrtShell;
class SwContentArr;
diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx
index d61f10b..899575b 100644
--- a/sw/source/uibase/inc/convert.hxx
+++ b/sw/source/uibase/inc/convert.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_CONVERT_HXX
#include <sfx2/basedlgs.hxx>
#include <tblafmt.hxx>
class VclContainer;
class SwTableAutoFormat;
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 8f3de7d..58fffc2 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_CPTION_HXX
#include <sfx2/basedlgs.hxx>
#include "actctrl.hxx"
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx
index 66a50c0..3e8be7c 100644
--- a/sw/source/uibase/inc/dbtree.hxx
+++ b/sw/source/uibase/inc/dbtree.hxx
@@ -23,7 +23,6 @@
#include <vcl/weld.hxx>
#include <swdllapi.h>
#include <swtypes.hxx>
class SwDBTreeList_Impl;
class SwWrtShell;
diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx
index 22b219a..d4afc74 100644
--- a/sw/source/uibase/inc/dbui.hxx
+++ b/sw/source/uibase/inc/dbui.hxx
@@ -21,6 +21,8 @@
#include <vcl/weld.hxx>
#include <swdllapi.h>
class SW_DLLPUBLIC PrintMonitor: public weld::GenericDialogController
{
public:
diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx
index 5b91413..2476099 100644
--- a/sw/source/uibase/inc/drawbase.hxx
+++ b/sw/source/uibase/inc/drawbase.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_DRAWBASE_HXX
#include <tools/gen.hxx>
#include <vcl/vclptr.hxx>
class SwView;
class SwWrtShell;
diff --git a/sw/source/uibase/inc/drawsh.hxx b/sw/source/uibase/inc/drawsh.hxx
index e0fd449..b204a39 100644
--- a/sw/source/uibase/inc/drawsh.hxx
+++ b/sw/source/uibase/inc/drawsh.hxx
@@ -21,6 +21,8 @@
#include "drwbassh.hxx"
#include <svx/svdobj.hxx>
class SwDrawBaseShell;
class SwDrawShell: public SwDrawBaseShell
diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx
index a4c5fa9..454385a 100644
--- a/sw/source/uibase/inc/drpcps.hxx
+++ b/sw/source/uibase/inc/drpcps.hxx
@@ -19,12 +19,12 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRPCPS_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_DRPCPS_HXX
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <editeng/svxfont.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/customweld.hxx>
#include <vcl/print.hxx>
class SwWrtShell;
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index abb7f4c..44d5d78 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -24,7 +24,6 @@
#include <svx/svdobj.hxx>
#include <tools/link.hxx>
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
#include <vcl/window.hxx>
#include <vcl/transfer.hxx>
#include <swevent.hxx>
diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx
index c14a4a1..c10cda5 100644
--- a/sw/source/uibase/inc/fldedt.hxx
+++ b/sw/source/uibase/inc/fldedt.hxx
@@ -18,8 +18,10 @@
*/
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDEDT_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDEDT_HXX
#include <fldbas.hxx>
#include <sfx2/basedlgs.hxx>
#include <vcl/button.hxx>
class SwView;
class SwWrtShell;
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index e954e52b..d37ab8e 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -19,11 +19,10 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDMGR_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDMGR_HXX
#include <fldbas.hxx>
#include <swdllapi.h>
#include <swtypes.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Any.h>
#include <vcl/vclptr.hxx>
#include <memory>
#include <vector>
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index 3d0cd3a..6532ff7 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
#include <vcl/vclptr.hxx>
#include <swabstdlg.hxx>
#include "chldwrap.hxx"
class AbstractSwFieldDlg;
diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx
index 71cdc06..388f16d 100644
--- a/sw/source/uibase/inc/fontcfg.hxx
+++ b/sw/source/uibase/inc/fontcfg.hxx
@@ -22,7 +22,6 @@
#include <rtl/ustring.hxx>
#include <unotools/configitem.hxx>
#include <i18nlangtag/lang.h>
#include <osl/diagnose.h>
#include <swdllapi.h>
#define FONT_STANDARD 0
diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx
index ec63b96..d14710d 100644
--- a/sw/source/uibase/inc/frmdlg.hxx
+++ b/sw/source/uibase/inc/frmdlg.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMDLG_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMDLG_HXX
#include <globals.hrc>
#include <sfx2/tabdlg.hxx>
#include <sfx2/viewfrm.hxx>
class SwWrtShell;
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index 94f3c3b..61267e5 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -20,11 +20,10 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMMGR_HXX
#include <swtypes.hxx>
#include <frmatr.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/shaditem.hxx>
#include <tools/gen.hxx>
#include <fmtfsize.hxx>
#include <fmtsrnd.hxx>
#include <fmtornt.hxx>
#include <fmtanchr.hxx>
#include <swdllapi.h>
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 0f50b3b..8e89292 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -24,8 +24,6 @@
#include <svx/dialcontrol.hxx>
#include <svx/frmdirlbox.hxx>
#include <svx/swframeexample.hxx>
#include <svx/swframeposstrings.hxx>
#include <globals.hrc>
#include <swtypes.hxx>
#include "bmpwin.hxx"
#include "prcntfld.hxx"
diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx
index c57a762..bf36a84 100644
--- a/sw/source/uibase/inc/gloshdl.hxx
+++ b/sw/source/uibase/inc/gloshdl.hxx
@@ -21,6 +21,8 @@
#include <memory>
#include <rtl/ustring.hxx>
#include <vcl/weld.hxx>
#include <swdllapi.h>
class SwWrtShell;
diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx
index bf6b863..038b046 100644
--- a/sw/source/uibase/inc/gloslst.hxx
+++ b/sw/source/uibase/inc/gloslst.hxx
@@ -24,6 +24,8 @@
#include <tools/datetime.hxx>
#include <vcl/timer.hxx>
#include <vector>
class SwGlossaries;
class vector;
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index 8293793..899b3a7 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -20,19 +20,13 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSSARY_HXX
#include <vcl/edit.hxx>
#include <vcl/treelistbox.hxx>
#include <vcl/customweld.hxx>
#include <vcl/weld.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/menubtn.hxx>
#include <com/sun/star/text/XAutoTextContainer2.hpp>
#include <rtl/ustring.hxx>
#include "actctrl.hxx"
#include <sfx2/basedlgs.hxx>
struct GroupUserData;
class SwGlossaryHdl;
diff --git a/sw/source/uibase/inc/grfsh.hxx b/sw/source/uibase/inc/grfsh.hxx
index 139a7a8..357fabf 100644
--- a/sw/source/uibase/inc/grfsh.hxx
+++ b/sw/source/uibase/inc/grfsh.hxx
@@ -20,7 +20,12 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_GRFSH_HXX
#include <memory>
#include "frmsh.hxx"
#include <vector>
#include "basesh.hxx"
#include <shellid.hxx>
#include <sfx2/shell.hxx>
class SwGrfShell: public SwBaseShell
{
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index 0eaeb64..866239a 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_HYP_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_HYP_HXX
#include <tools/link.hxx>
#include <editeng/splwrap.hxx>
#include <com/sun/star/linguistic2/XHyphenator.hpp>
#include <swdllapi.h>
diff --git a/sw/source/uibase/inc/imaildsplistener.hxx b/sw/source/uibase/inc/imaildsplistener.hxx
index 82bd2dd..1dcf286 100644
--- a/sw/source/uibase/inc/imaildsplistener.hxx
+++ b/sw/source/uibase/inc/imaildsplistener.hxx
@@ -22,6 +22,7 @@
#include <com/sun/star/mail/XMailMessage.hpp>
#include <salhelper/simplereferenceobject.hxx>
#include <rtl/ref.hxx>
class MailDispatcher;
diff --git a/sw/source/uibase/inc/initui.hxx b/sw/source/uibase/inc/initui.hxx
index 2cb010f..5f2b145 100644
--- a/sw/source/uibase/inc/initui.hxx
+++ b/sw/source/uibase/inc/initui.hxx
@@ -19,12 +19,9 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INITUI_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_INITUI_HXX
#include <tools/solar.h>
#include <swdllapi.h>
#include <rtl/ustring.hxx>
#include <vector>
/*
* Forward Declarations
*/
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 0e95f81..f5a59db 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -77,6 +77,7 @@
#include <docstat.hxx>
#include <usrfld.hxx>
#include <expfld.hxx>
#include <fmtsrnd.hxx>
#include <fldmgr.hxx>
#include <frmmgr.hxx>
#include <tablemgr.hxx>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 371a29af..2624463 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -94,6 +94,7 @@
#include <fmtinfmt.hxx>
#include <mdiexp.hxx>
#include <drawbase.hxx>
#include <frmatr.hxx>
#include <frmmgr.hxx>
#include <pagedesc.hxx>
#include <section.hxx>
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index d45a8ef..0e7fad7 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -51,6 +51,7 @@
#include <navicont.hxx>
#include <edtwin.hxx>
#include <uitool.hxx>
#include <toxmgr.hxx>
#include <cmdid.h>
#include <helpids.h>
