tdf#42949 Fix IWYU warnings in lotuswordpro/inc/*

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

Change-Id: I6bb0a9d668a2acf64e965bf74823b43f3ec2c8ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91733
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

52 files changed, 63 insertions, 2 deletions

diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
index 442913713ec5..fb42e6e6db3d 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
@@ -62,6 +62,8 @@
 #include <lwpcolor.hxx>
 #include "lwpstyledef.hxx"
 
+#include <memory>
+
 class XFBGImage;
 class LwpBackgroundStuff
 {
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
index 5e3c7cdba25b..da393770d06e 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
@@ -68,6 +68,7 @@
 #include "lwpcharborderoverride.hxx"
 #include <xfilter/xfparastyle.hxx>
 #include <xfilter/xffont.hxx>
+#include <xfilter/xftextstyle.hxx>
 
 
 /*class LwpTextStyle*/
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index 96f4c2f1bbfd..fd6e567ee030 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -66,6 +66,7 @@
 #include "lwplayout.hxx"
 #include "lwppagelayout.hxx"
 #include "lwpverdocument.hxx"
+#include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfstylemanager.hxx>
 #include <osl/thread.h>
 #include <o3tl/sorted_vector.hxx>
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 4e743eb4da0f..6f95fb651f64 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -59,6 +59,7 @@
  ************************************************************************/
 #include "lwpfilter.hxx"
 #include "lwpresource.hxx"
+#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfsaxstream.hxx>
 #include "lwp9reader.hxx"
 #include <lwpsvstream.hxx>
@@ -84,8 +85,6 @@ using namespace ::cppu;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::registry;
-using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star;
 
diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index 7015bfb7a573..f8d807757778 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -55,6 +55,7 @@
  ************************************************************************/
 #include <lwpglobalmgr.hxx>
 #include <lwpfont.hxx>
+#include <lwpbasetype.hxx>
 #include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xffontfactory.hxx>
 #include <xfilter/xftextstyle.hxx>
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx
index 12226c95255c..ce6b8f33d08f 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -69,6 +69,7 @@
 #include "lwpsection.hxx"
 #include "lwpcharacterstyle.hxx"
 #include <lwpglobalmgr.hxx>
+#include <lwpobjtags.hxx>
 #include <xfilter/xfstylemanager.hxx>
 #include "lwplayout.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index c5bd91ab0adf..cb14d3a4324d 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -68,6 +68,7 @@
 #include <xfilter/xfsection.hxx>
 #include <xfilter/xfsectionstyle.hxx>
 #include <xfilter/xftextspan.hxx>
+#include <xfilter/xftextstyle.hxx>
 #include <xfilter/xftextcontent.hxx>
 #include "lwpfribheader.hxx"
 #include "lwpfribtext.hxx"
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index f1d9917de8bf..f41f5b0e7d2d 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -73,6 +73,7 @@
 #include "lwpfribbreaks.hxx"
 #include "lwpfribframe.hxx"
 #include "lwpfribtable.hxx"
+#include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfstylemanager.hxx>
 #include "lwphyperlinkmgr.hxx"
 #include <xfilter/xfhyperlink.hxx>
diff --git a/lotuswordpro/source/filter/lwpfribtext.cxx b/lotuswordpro/source/filter/lwpfribtext.cxx
index 0ae66e675b19..fab2252cb24a 100644
--- a/lotuswordpro/source/filter/lwpfribtext.cxx
+++ b/lotuswordpro/source/filter/lwpfribtext.cxx
@@ -75,6 +75,7 @@
 #include <xfilter/xftimestyle.hxx>
 #include <xfilter/xfdate.hxx>
 #include <xfilter/xfannotation.hxx>
+#include <xfilter/xfpagecount.hxx>
 
 LwpFribText::LwpFribText( LwpPara *pPara, bool bNoUnicode )
     : LwpFrib(pPara), m_bNoUnicode(bNoUnicode)
diff --git a/lotuswordpro/source/filter/lwpidxmgr.cxx b/lotuswordpro/source/filter/lwpidxmgr.cxx
index b695f78c1824..26042fc96840 100644
--- a/lotuswordpro/source/filter/lwpidxmgr.cxx
+++ b/lotuswordpro/source/filter/lwpidxmgr.cxx
@@ -67,6 +67,7 @@
 **********************************************************************************************************************/
 
 #include <lwpidxmgr.hxx>
+#include <lwpobjhdr.hxx>
 #include <lwptools.hxx>
 #include <memory>
 
diff --git a/lotuswordpro/source/filter/lwpobjhdr.cxx b/lotuswordpro/source/filter/lwpobjhdr.cxx
index bf13cfded8c6..d93cf001fd19 100644
--- a/lotuswordpro/source/filter/lwpobjhdr.cxx
+++ b/lotuswordpro/source/filter/lwpobjhdr.cxx
@@ -59,6 +59,7 @@
  ************************************************************************/
 
 #include <lwpobjhdr.hxx>
+#include <lwpobjtags.hxx>
 #include <lwpdefs.hxx>
 #include <lwpfilehdr.hxx>
 
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index 8409e9d87411..db757cca43fc 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -62,6 +62,7 @@
 
 #include <lwpglobalmgr.hxx>
 #include "lwpstory.hxx"
+#include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfstylemanager.hxx>
 #include "lwppara.hxx"
 #include <lwpobjfactory.hxx>
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
index 700fcfefdbbc..d4b4e5be6520 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
@@ -58,6 +58,8 @@
  * Background image.
  ************************************************************************/
 #include <xfilter/xfbgimage.hxx>
+#include <xfilter/ixfattrlist.hxx>
+#include <xfilter/xfutil.hxx>
 #include "xfbase64.hxx"
 
 XFBGImage::XFBGImage()
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx
index 3be2c4e43455..f6027a1558ad 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx
@@ -58,6 +58,8 @@
  * Border object,now only used by paragraph object.
  ************************************************************************/
 #include <xfilter/xfborders.hxx>
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 XFBorder::XFBorder()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index 289e34435094..bbfde6eab9f3 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -61,9 +61,11 @@
 
 #include <stdexcept>
 
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfparagraph.hxx>
 #include <xfilter/xftable.hxx>
 #include <xfilter/xfrow.hxx>
+#include <xfilter/xfutil.hxx>
 
 XFCell::XFCell()
     : m_pOwnerRow(nullptr)
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
index ebd015a19584..e615778a94f1 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
@@ -61,6 +61,7 @@
 #include <xfilter/xfborders.hxx>
 #include <xfilter/xffont.hxx>
 #include <xfilter/xfbgimage.hxx>
+#include <xfilter/xfutil.hxx>
 
 XFCellStyle::XFCellStyle()
     : m_eHoriAlign(enumXFAlignNone)
diff --git a/lotuswordpro/source/filter/xfilter/xfchange.cxx b/lotuswordpro/source/filter/xfilter/xfchange.cxx
index 554e420b8ba6..0beef2120b43 100644
--- a/lotuswordpro/source/filter/xfilter/xfchange.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfchange.cxx
@@ -58,6 +58,7 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfchange.hxx>
 
 void XFChangeList::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
index e13810a5023e..c0d96851ec8f 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
@@ -58,6 +58,7 @@
  * Column style object.
  ************************************************************************/
 #include <xfilter/xfcolstyle.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 XFColStyle::XFColStyle()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
index 3616610151af..b5f427d883b8 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
@@ -58,6 +58,7 @@
  * Columns styles for section, or paragraph.
  ************************************************************************/
 #include <xfilter/xfcolumns.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 void    XFColumn::SetRelWidth(sal_Int32 width)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.cxx b/lotuswordpro/source/filter/xfilter/xfdate.cxx
index dd6186809207..615f8512224c 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.cxx
@@ -59,6 +59,7 @@
  ************************************************************************/
 #include <string.h>
 #include <xfilter/xfdate.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 XFDate::XFDate()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx
index 54c039c95787..77eeb6acab25 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx
@@ -57,6 +57,7 @@
  * @file
  * Date style. The date format for date field.
  ************************************************************************/
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfdatestyle.hxx>
 
 XFDatePart::XFDatePart()
diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
index 7281f063c9e7..da32ed829cf8 100644
--- a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
@@ -57,6 +57,8 @@
  * @file
  * doc field.
  ************************************************************************/
+#include <xfilter/ixfattrlist.hxx>
+#include <xfilter/ixfstream.hxx>
 #include <xfilter/xfdocfield.hxx>
 
 void XFFileName::SetType(const OUString& sType)
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx
index 87f619527f85..045054399510 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx
@@ -58,6 +58,7 @@
  * Area style of Drawing object.
  ************************************************************************/
 #include "xfdrawareastyle.hxx"
+#include <xfilter/ixfattrlist.hxx>
 
 XFDrawAreaStyle::XFDrawAreaStyle()
     : m_eAreaStyle(enumXFAreaSolid)
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
index 6b9c7b67656a..32a68f9dff82 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
@@ -58,6 +58,7 @@
  * Line object.
  ************************************************************************/
 #include <xfilter/xfdrawline.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 XFDrawLine::XFDrawLine()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx
index a0e95fd7975c..4c9b4e066ba4 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx
@@ -57,6 +57,7 @@
  * @file
  * Line style of Drawing object.
  ************************************************************************/
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfdrawlinestyle.hxx>
 
 XFDrawLineStyle::XFDrawLineStyle()
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
index 77f015559753..0cac7a8f797c 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
@@ -58,6 +58,7 @@
  * Interface for all Drawing object.
  ************************************************************************/
 #include <xfilter/xfdrawobj.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 XFDrawObject::XFDrawObject()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
index 9061f583f152..a356ea5ef56e 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -58,6 +58,7 @@
  * Draw path object.
  ************************************************************************/
 #include <xfilter/xfdrawpath.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <rtl/ustrbuf.hxx>
 
 XFSvgPathEntry::XFSvgPathEntry()
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
index dcc12c2dadb8..c499f8800525 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
@@ -58,6 +58,7 @@
  * Polygon object.
  */
 #include <xfilter/xfdrawpolygon.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <rtl/ustrbuf.hxx>
 
 XFDrawPolygon::XFDrawPolygon()
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
index 4cad76ebb3c4..ed1ec06915c8 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
@@ -58,6 +58,7 @@
  * Polyline.
  ************************************************************************/
 #include <xfilter/xfdrawpolyline.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <rtl/ustrbuf.hxx>
 
 XFDrawPolyline::XFDrawPolyline()
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx b/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
index 63bf4b6b347e..53fd9ff52180 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
@@ -58,6 +58,7 @@
  * Rect object.
  ************************************************************************/
 #include <xfilter/xfdrawrect.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 XFDrawRect::XFDrawRect()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
index 0228a5d9189f..62abd3afbc11 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
@@ -59,6 +59,7 @@
  ************************************************************************/
 #include <xfilter/xfdrawstyle.hxx>
 #include <xfilter/xfdrawlinestyle.hxx>
+#include <xfilter/xfglobal.hxx>
 #include "xfdrawareastyle.hxx"
 #include <xfilter/xfstylemanager.hxx>
 #include "xffontworkstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
index 0f4532e45f61..7a27242cd242 100644
--- a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
@@ -57,6 +57,8 @@
  * @file
  * Float frame whose anchor is page.
  ************************************************************************/
+#include <xfilter/ixfattrlist.hxx>
+#include <xfilter/ixfstream.hxx>
 #include <xfilter/xffloatframe.hxx>
 
 XFFloatFrame::XFFloatFrame(sal_Int32 start, sal_Int32 end, bool all)
diff --git a/lotuswordpro/source/filter/xfilter/xffont.cxx b/lotuswordpro/source/filter/xfilter/xffont.cxx
index 8e906af25a47..14bb56db6160 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.cxx
@@ -57,7 +57,9 @@
  * @file
  * Font object to serial to xml filter.
  ************************************************************************/
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xffont.hxx>
+#include <xfilter/xfutil.hxx>
 
 XFFont::XFFont()
     : m_nFontSize(0)
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx
index 8b469c31eddf..f968303da470 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx
@@ -57,6 +57,8 @@
  * @file
  * Frame whose anchor is not page.
  ************************************************************************/
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfframe.hxx>
 #include <xfilter/xfparagraph.hxx>
 #define     ZINDEX_MIN 0
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
index 472e11072c8a..e3c5b315cc45 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
@@ -62,6 +62,7 @@
 #include <xfilter/xfborders.hxx>
 #include <xfilter/xfshadow.hxx>
 #include <xfilter/xfbgimage.hxx>
+#include <xfilter/xfutil.hxx>
 
 XFFrameStyle::XFFrameStyle()
     : m_eWrap(enumXFWrapNone)
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx b/lotuswordpro/source/filter/xfilter/xfimage.cxx
index 7f24974db691..cf0100014a25 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx
@@ -58,6 +58,7 @@
  * Image object.
  ************************************************************************/
 #include <xfilter/xfimage.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include "xfbase64.hxx"
 
 XFImage::XFImage() : m_bUseLink(false)
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
index 5885d7e95e59..0694fdc26770 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
@@ -59,7 +59,9 @@
  ************************************************************************/
 #include <xfilter/xfimagestyle.hxx>
 #include <xfilter/xfborders.hxx>
+#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfshadow.hxx>
+#include <xfilter/xfutil.hxx>
 
 XFImageStyle::XFImageStyle()
     : m_nBrightness(0)
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index f141a0e46b10..4feb10bd96c2 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -57,6 +57,7 @@
  * @file
  * Represents index source, index body and index entry.
  ************************************************************************/
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfindex.hxx>
 #include <xfilter/xfparagraph.hxx>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
index 5205020784d4..4f4f32ea7f72 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
@@ -58,6 +58,8 @@
  * Styles for ordered list and unordered list.
  ************************************************************************/
 #include <xfilter/xfliststyle.hxx>
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfutil.hxx>
 
 XFListLevel::XFListLevel()
     : m_nLevel(0)
diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.cxx b/lotuswordpro/source/filter/xfilter/xfmargins.cxx
index f447450db5a9..b6aab56d0451 100644
--- a/lotuswordpro/source/filter/xfilter/xfmargins.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmargins.cxx
@@ -58,6 +58,7 @@
  * Margins object, include left margin,right margin,top margin and bottom margin.
  ************************************************************************/
 
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfmargins.hxx>
 
 XFMargins::XFMargins()
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
index 7406e7685387..169f5e7e5a30 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
@@ -57,6 +57,7 @@
  * @file
  * Number style for table cell.
  ************************************************************************/
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfnumberstyle.hxx>
 
 XFNumberStyle::XFNumberStyle()
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
index ca5d1adbb84f..d6419e1dfe0f 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
@@ -67,6 +67,7 @@
 #include <xfilter/xfheaderstyle.hxx>
 #include <xfilter/xffooterstyle.hxx>
 #include <xfilter/xfbgimage.hxx>
+#include <xfilter/xfutil.hxx>
 
 XFPageMaster::XFPageMaster() : m_fPageWidth(0), m_fPageHeight(0), m_eUsage(enumXFPageUsageNone),
 m_eTextDir(enumXFTextDirNone),
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index b8f9155752c2..4e298a248b3b 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -64,6 +64,7 @@
 #include <xfilter/xfborders.hxx>
 #include "xftabstyle.hxx"
 #include <xfilter/xfbgimage.hxx>
+#include <xfilter/xfutil.hxx>
 
 XFParaStyle::XFParaStyle()
     : m_eAlignType(enumXFAlignNone)
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
index 0ff3893b9a65..3a1982853bff 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
@@ -59,6 +59,7 @@
  ************************************************************************/
 #include <xfilter/xfrowstyle.hxx>
 #include <xfilter/xfbgimage.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 XFRowStyle::XFRowStyle():m_fHeight(0)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx
index 7f94f726184d..dd503bb6896f 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx
@@ -58,6 +58,8 @@
  * Section object.
  ************************************************************************/
 #include <xfilter/xfsection.hxx>
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 XFSection::XFSection()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
index 2ffb4850beca..0bf664d6a077 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
@@ -57,6 +57,7 @@
  * @file
  * Section style,whose family is "section"
  ************************************************************************/
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfsectionstyle.hxx>
 #include <xfilter/xfcolumns.hxx>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
index 8eb969b0b5a5..a5acfb343eda 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
@@ -57,6 +57,7 @@
  * @file
  * Shadow object,now only used by paragraph object.
  ************************************************************************/
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfshadow.hxx>
 
 XFShadow::XFShadow()
diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 9fb95b03ba9f..491bbba06677 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -61,6 +61,7 @@
 #include <xfilter/xfrow.hxx>
 #include <xfilter/xfcolstyle.hxx>
 #include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfglobal.hxx>
 #include <cassert>
 
 XFTable::XFTable()
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
index 18c5297cb97c..c86d6420ff08 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
@@ -58,6 +58,7 @@
  * Tab style for paragraph.include tab offset and tab char properties.
  ************************************************************************/
 #include "xftabstyle.hxx"
+#include <xfilter/ixfattrlist.hxx>
 
 XFTabStyle::XFTabStyle()
     : m_eType(enumXFTabNone)
diff --git a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
index 39336dd4fd07..eed8df9439d9 100644
--- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
@@ -53,6 +53,7 @@
  *
  *
  ************************************************************************/
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xftextboxstyle.hxx>
 #include <xfilter/xfcolumns.hxx>
 #include <xfilter/xfborders.hxx>
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
index 6ccb241496fd..945b2411459b 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
@@ -55,6 +55,7 @@
  ************************************************************************/
 
 #include <xfilter/xftextcontent.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/ixfstream.hxx>
 
 XFTextContent::XFTextContent(const OUString& text):m_strText(text)
diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
index 2f378094f379..95a8e7acb875 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
@@ -59,6 +59,7 @@
  ************************************************************************/
 
 #include <xfilter/xftimestyle.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 XFTimePart::XFTimePart()
 {