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>

88 files changed, 97 insertions, 118 deletions

diff --git a/lotuswordpro/inc/lwpatomholder.hxx b/lotuswordpro/inc/lwpatomholder.hxx
index e6f4ae57377c..fc7084f27f5b 100644
--- a/lotuswordpro/inc/lwpatomholder.hxx
+++ b/lotuswordpro/inc/lwpatomholder.hxx
@@ -56,7 +56,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPATOMHOLDER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPATOMHOLDER_HXX
 
-#include "lwpheader.hxx"
+#include <config_lgpl.h>
 #include "lwpdefs.hxx"
 #include "lwpobjstrm.hxx"
 /**
diff --git a/lotuswordpro/inc/lwpbasetype.hxx b/lotuswordpro/inc/lwpbasetype.hxx
index 99f33050b2fe..20b4c625ca15 100644
--- a/lotuswordpro/inc/lwpbasetype.hxx
+++ b/lotuswordpro/inc/lwpbasetype.hxx
@@ -63,7 +63,7 @@
 #define INCLUDED_LOTUSWORDPRO_INC_LWPBASETYPE_HXX
 
 #include "lwpobjstrm.hxx"
-#include "lwpheader.hxx"
+#include <config_lgpl.h>
 
 /**
  * @brief   used for lwpfont for font description
diff --git a/lotuswordpro/inc/lwpbookmarkmgr.hxx b/lotuswordpro/inc/lwpbookmarkmgr.hxx
index 9dbeb344e262..3cc02b121a66 100644
--- a/lotuswordpro/inc/lwpbookmarkmgr.hxx
+++ b/lotuswordpro/inc/lwpbookmarkmgr.hxx
@@ -61,9 +61,12 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPBOOKMARKMGR_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPBOOKMARKMGR_HXX
 
-#include "lwpfilehdr.hxx"
+#include <config_lgpl.h>
+
 #include <map>
 
+#include <rtl/ref.hxx>
+
 #include "xfilter/xfbookmark.hxx"
 
 class LwpBookmarkMgr
diff --git a/lotuswordpro/inc/lwpchangemgr.hxx b/lotuswordpro/inc/lwpchangemgr.hxx
index fb39042aa232..b436024e8f9b 100644
--- a/lotuswordpro/inc/lwpchangemgr.hxx
+++ b/lotuswordpro/inc/lwpchangemgr.hxx
@@ -63,11 +63,8 @@
 
 #include <map>
 #include <vector>
+#include <config_lgpl.h>
 #include "lwpfrib.hxx"
-#include "lwpobjstrm.hxx"
-#include "lwpbasetype.hxx"
-#include "lwpoverride.hxx"
-#include "lwpfoundry.hxx"
 #include "xfilter/xfchange.hxx"
 #include "xfilter/xfcontentcontainer.hxx"
 
diff --git a/lotuswordpro/inc/lwpcolor.hxx b/lotuswordpro/inc/lwpcolor.hxx
index 3ca8698800ad..b555302bdd84 100644
--- a/lotuswordpro/inc/lwpcolor.hxx
+++ b/lotuswordpro/inc/lwpcolor.hxx
@@ -62,7 +62,7 @@
 #define INCLUDED_LOTUSWORDPRO_INC_LWPCOLOR_HXX
 
 #include "lwpobjstrm.hxx"
-#include "lwpheader.hxx"
+#include <config_lgpl.h>
 /**
  * @brief   lwpcolor class
  *      (red, green, blue, extra)
diff --git a/lotuswordpro/inc/lwpdocdata.hxx b/lotuswordpro/inc/lwpdocdata.hxx
index 8866bedda731..b04c00bb1a3f 100644
--- a/lotuswordpro/inc/lwpdocdata.hxx
+++ b/lotuswordpro/inc/lwpdocdata.hxx
@@ -55,12 +55,11 @@
  ************************************************************************/
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPDOCDATA_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPDOCDATA_HXX
+#include <config_lgpl.h>
 #include "lwpobj.hxx"
 #include "lwpatomholder.hxx"
 #include "localtime.hxx"
 #include "lwpcolor.hxx"
-#include "xfilter/xfcolor.hxx"
-#include <map>
 
 struct LwpDocOptions
 {
diff --git a/lotuswordpro/inc/lwpfont.hxx b/lotuswordpro/inc/lwpfont.hxx
index cc1dc713347e..301c65e9e3cf 100644
--- a/lotuswordpro/inc/lwpfont.hxx
+++ b/lotuswordpro/inc/lwpfont.hxx
@@ -64,14 +64,12 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPFONT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPFONT_HXX
 
-#include "lwpheader.hxx"
+#include <config_lgpl.h>
+#include <rtl/ref.hxx>
 #include "lwpobjstrm.hxx"
 #include "lwpatomholder.hxx"
 #include "lwpcolor.hxx"
-#include "lwpbasetype.hxx"
-#include "lwpobj.hxx"
 #include "xfilter/xffont.hxx"
-#include "xfilter/xftextstyle.hxx"
 #include <memory>
 
 class LwpFontTableEntry
diff --git a/lotuswordpro/inc/lwpfoundry.hxx b/lotuswordpro/inc/lwpfoundry.hxx
index a625ac6ff50f..36919dd9da4e 100644
--- a/lotuswordpro/inc/lwpfoundry.hxx
+++ b/lotuswordpro/inc/lwpfoundry.hxx
@@ -61,20 +61,18 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPFOUNDRY_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPFOUNDRY_HXX
 
-#include "lwpheader.hxx"
+#include <config_lgpl.h>
 #include "lwpobjid.hxx"
 #include "lwpobjstrm.hxx"
-#include "lwpcolor.hxx"
-#include "lwpbasetype.hxx"
 #include "lwpfont.hxx"
 #include "lwpdropcapmgr.hxx"
+#include "xfilter/ixfstyle.hxx"
 #include <unordered_map>
 
 class LwpDocument;
 class LwpBookMark;
 
 #include <memory>
-#include <vector>
 
 class LwpVersionManager
 {
diff --git a/lotuswordpro/inc/lwpfrib.hxx b/lotuswordpro/inc/lwpfrib.hxx
index 753bdc5999cf..9af56ab38fcd 100644
--- a/lotuswordpro/inc/lwpfrib.hxx
+++ b/lotuswordpro/inc/lwpfrib.hxx
@@ -60,10 +60,11 @@
 
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPFRIB_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPFRIB_HXX
+#include <map>
 #include <memory>
+#include <config_lgpl.h>
 #include "lwpobjid.hxx"
 #include "lwpobjstrm.hxx"
-#include "lwpbasetype.hxx"
 #include "lwpoverride.hxx"
 #include "lwpfoundry.hxx"
 #include "xfilter/xfcolor.hxx"
diff --git a/lotuswordpro/inc/lwpglobalmgr.hxx b/lotuswordpro/inc/lwpglobalmgr.hxx
index d0e2eee3ca7a..9bfc5e3d6513 100644
--- a/lotuswordpro/inc/lwpglobalmgr.hxx
+++ b/lotuswordpro/inc/lwpglobalmgr.hxx
@@ -63,7 +63,7 @@
 
 #include <memory>
 #include <map>
-#include "lwpheader.hxx"
+#include <config_lgpl.h>
 #include "lwpsvstream.hxx"
 #include "lwpobjfactory.hxx"
 #include "lwpbookmarkmgr.hxx"
diff --git a/lotuswordpro/inc/lwpidxmgr.hxx b/lotuswordpro/inc/lwpidxmgr.hxx
index fc01fed425a4..e3165cdce20e 100644
--- a/lotuswordpro/inc/lwpidxmgr.hxx
+++ b/lotuswordpro/inc/lwpidxmgr.hxx
@@ -61,8 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPIDXMGR_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPIDXMGR_HXX
 
-#include <rtl/ustring.hxx>
-#include "lwpobjhdr.hxx"
+#include <config_lgpl.h>
+#include "lwpobjid.hxx"
 #include "lwpobjstrm.hxx"
 
 /**
diff --git a/lotuswordpro/inc/lwpobj.hxx b/lotuswordpro/inc/lwpobj.hxx
index 0cb7b428e28f..e9b6c98faf3c 100644
--- a/lotuswordpro/inc/lwpobj.hxx
+++ b/lotuswordpro/inc/lwpobj.hxx
@@ -68,7 +68,7 @@
 
 #include <salhelper/simplereferenceobject.hxx>
 
-#include "lwpheader.hxx"
+#include <config_lgpl.h>
 
 #include "lwpobjhdr.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/inc/lwpobjfactory.hxx b/lotuswordpro/inc/lwpobjfactory.hxx
index f3a00e1f769c..b1d644b0d485 100644
--- a/lotuswordpro/inc/lwpobjfactory.hxx
+++ b/lotuswordpro/inc/lwpobjfactory.hxx
@@ -63,9 +63,10 @@
 
 #include <sal/config.h>
 
+#include <config_lgpl.h>
+
 #include <rtl/ref.hxx>
 
-#include "lwpheader.hxx"
 #include "lwpobjid.hxx"
 #include "lwpobj.hxx"
 #include "lwpobjhdr.hxx"
diff --git a/lotuswordpro/inc/lwpobjhdr.hxx b/lotuswordpro/inc/lwpobjhdr.hxx
index a1dc885dfcbd..e61b587f3190 100644
--- a/lotuswordpro/inc/lwpobjhdr.hxx
+++ b/lotuswordpro/inc/lwpobjhdr.hxx
@@ -61,8 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPOBJHDR_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPOBJHDR_HXX
 
+#include <config_lgpl.h>
 #include "lwpobjid.hxx"
-#include "lwpobjtags.hxx"
+
 /**
  * @brief   Base class of all Lwp VO objects
 */
diff --git a/lotuswordpro/inc/lwpobjid.hxx b/lotuswordpro/inc/lwpobjid.hxx
index f6ae47f8a53c..b35e58450e77 100644
--- a/lotuswordpro/inc/lwpobjid.hxx
+++ b/lotuswordpro/inc/lwpobjid.hxx
@@ -63,9 +63,10 @@
 
 #include <sal/config.h>
 
+#include <config_lgpl.h>
+
 #include <rtl/ref.hxx>
 
-#include "lwpheader.hxx"
 #include "lwpobjstrm.hxx"
 #include "lwpdefs.hxx"
 
diff --git a/lotuswordpro/inc/lwpobjstrm.hxx b/lotuswordpro/inc/lwpobjstrm.hxx
index 0e702bb96a34..adde15593c4d 100644
--- a/lotuswordpro/inc/lwpobjstrm.hxx
+++ b/lotuswordpro/inc/lwpobjstrm.hxx
@@ -62,8 +62,13 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPOBJSTRM_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPOBJSTRM_HXX
 
-#include "lwpheader.hxx"
+#include <config_lgpl.h>
+
+#include <rtl/ustring.hxx>
+#include <vector>
+
 #include "lwpsvstream.hxx"
+
 /**
  * @brief   stream class for LwpObject body data
  *          provide stream like interface to read object data
diff --git a/lotuswordpro/inc/lwpsvstream.hxx b/lotuswordpro/inc/lwpsvstream.hxx
index 7b119403d761..445c2df5d0ae 100644
--- a/lotuswordpro/inc/lwpsvstream.hxx
+++ b/lotuswordpro/inc/lwpsvstream.hxx
@@ -56,7 +56,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPSVSTREAM_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPSVSTREAM_HXX
 
-#include "lwpheader.hxx"
+#include <config_lgpl.h>
+
+#include <sal/types.h>
 
 class SvStream;
 
diff --git a/lotuswordpro/inc/lwptools.hxx b/lotuswordpro/inc/lwptools.hxx
index 3013c20435da..7a360cdda9ea 100644
--- a/lotuswordpro/inc/lwptools.hxx
+++ b/lotuswordpro/inc/lwptools.hxx
@@ -61,7 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_LWPTOOLS_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_LWPTOOLS_HXX
 
-#include "lwpheader.hxx"
+#include <config_lgpl.h>
+
 #include "lwpobjstrm.hxx"
 #include "localtime.hxx"
 #include "xfilter/xfdatestyle.hxx"
diff --git a/lotuswordpro/inc/xfilter/ixfstyle.hxx b/lotuswordpro/inc/xfilter/ixfstyle.hxx
index de80841430e4..878c8af6513c 100644
--- a/lotuswordpro/inc/xfilter/ixfstyle.hxx
+++ b/lotuswordpro/inc/xfilter/ixfstyle.hxx
@@ -60,7 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_IXFSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_IXFSTYLE_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfstream.hxx>
+#include <xfilter/xfdefs.hxx>
+
 /**
  * @descr
  * Interface for all style object.
diff --git a/lotuswordpro/inc/xfilter/xfannotation.hxx b/lotuswordpro/inc/xfilter/xfannotation.hxx
index 9821d8243a21..5987ed66503e 100644
--- a/lotuswordpro/inc/xfilter/xfannotation.hxx
+++ b/lotuswordpro/inc/xfilter/xfannotation.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFANNOTATION_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFANNOTATION_HXX
 
-#include <xfilter/xfglobal.hxx>
-#include <xfilter/xfcontent.hxx>
+#include <xfilter/ixfattrlist.hxx>
+#include <xfilter/ixfstream.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
 
 class XFAnnotation : public XFContentContainer
diff --git a/lotuswordpro/inc/xfilter/xfarrowstyle.hxx b/lotuswordpro/inc/xfilter/xfarrowstyle.hxx
index a1f622b32549..c356318f80e3 100644
--- a/lotuswordpro/inc/xfilter/xfarrowstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfarrowstyle.hxx
@@ -60,6 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFARROWSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFARROWSTYLE_HXX
 
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfstyle.hxx>
 
 class XFArrowStyle : public XFStyle
diff --git a/lotuswordpro/inc/xfilter/xfborders.hxx b/lotuswordpro/inc/xfilter/xfborders.hxx
index 0f202cf7dd59..2f9eadf48499 100644
--- a/lotuswordpro/inc/xfilter/xfborders.hxx
+++ b/lotuswordpro/inc/xfilter/xfborders.hxx
@@ -60,8 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBORDERS_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBORDERS_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfstream.hxx>
 #include <xfilter/xfcolor.hxx>
+#include <xfilter/xfdefs.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfbreaks.hxx b/lotuswordpro/inc/xfilter/xfbreaks.hxx
index a5a1bc443a5b..fe2d7cee19d1 100644
--- a/lotuswordpro/inc/xfilter/xfbreaks.hxx
+++ b/lotuswordpro/inc/xfilter/xfbreaks.hxx
@@ -60,7 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBREAKS_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBREAKS_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfattrlist.hxx>
+#include <xfilter/ixfstream.hxx>
+#include <xfilter/xfdefs.hxx>
 
 /**
  * @descr   Page|Column break object.
diff --git a/lotuswordpro/inc/xfilter/xfcell.hxx b/lotuswordpro/inc/xfilter/xfcell.hxx
index 2bdc97824323..81ab8aa59028 100644
--- a/lotuswordpro/inc/xfilter/xfcell.hxx
+++ b/lotuswordpro/inc/xfilter/xfcell.hxx
@@ -63,7 +63,6 @@
 
 #include <xfilter/xfcontent.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
-#include <vector>
 
 class XFTable;
 class XFRow;
diff --git a/lotuswordpro/inc/xfilter/xfchange.hxx b/lotuswordpro/inc/xfilter/xfchange.hxx
index 4d759cb03aec..29519e84763c 100644
--- a/lotuswordpro/inc/xfilter/xfchange.hxx
+++ b/lotuswordpro/inc/xfilter/xfchange.hxx
@@ -61,7 +61,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCHANGE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCHANGE_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/ixfstream.hxx>
 #include <xfilter/xfcontent.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
diff --git a/lotuswordpro/inc/xfilter/xfcolor.hxx b/lotuswordpro/inc/xfilter/xfcolor.hxx
index eec54c0a6c35..ffb16c3bf823 100644
--- a/lotuswordpro/inc/xfilter/xfcolor.hxx
+++ b/lotuswordpro/inc/xfilter/xfcolor.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLOR_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLOR_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <rtl/ustring.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfcolumns.hxx b/lotuswordpro/inc/xfilter/xfcolumns.hxx
index e3add23822f9..fe806c9feef1 100644
--- a/lotuswordpro/inc/xfilter/xfcolumns.hxx
+++ b/lotuswordpro/inc/xfilter/xfcolumns.hxx
@@ -60,8 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLUMNS_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLUMNS_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfstream.hxx>
 #include <xfilter/xfcolor.hxx>
+#include <xfilter/xfdefs.hxx>
 #include <vector>
 
 #define     XFCOLUMNS_FLAG_SEPARATOR    0X00000001
diff --git a/lotuswordpro/inc/xfilter/xfconfigmanager.hxx b/lotuswordpro/inc/xfilter/xfconfigmanager.hxx
index 39b965e184e2..78b5b97ba3de 100644
--- a/lotuswordpro/inc/xfilter/xfconfigmanager.hxx
+++ b/lotuswordpro/inc/xfilter/xfconfigmanager.hxx
@@ -64,7 +64,6 @@
 #include <xfilter/xflinenumberconfig.hxx>
 #include <xfilter/xffootnoteconfig.hxx>
 #include <xfilter/xfendnoteconfig.hxx>
-#include <xfilter/xfdefs.hxx>
 #include <memory>
 
 /**
diff --git a/lotuswordpro/inc/xfilter/xfcontent.hxx b/lotuswordpro/inc/xfilter/xfcontent.hxx
index cb3954b06dc8..2f04906a5a30 100644
--- a/lotuswordpro/inc/xfilter/xfcontent.hxx
+++ b/lotuswordpro/inc/xfilter/xfcontent.hxx
@@ -66,6 +66,7 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <stdexcept>
 
+#include <xfilter/ixfstream.hxx>
 #include <xfilter/xfdefs.hxx>
 
 class IXFStream;
diff --git a/lotuswordpro/inc/xfilter/xfdate.hxx b/lotuswordpro/inc/xfilter/xfdate.hxx
index abeb7028c497..9fe3ab94c783 100644
--- a/lotuswordpro/inc/xfilter/xfdate.hxx
+++ b/lotuswordpro/inc/xfilter/xfdate.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATE_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfcontent.hxx>
+#include <xfilter/ixfstream.hxx>
 
 /**
  * @descr   Date object.
diff --git a/lotuswordpro/inc/xfilter/xfdatestyle.hxx b/lotuswordpro/inc/xfilter/xfdatestyle.hxx
index a292a8fdd5fc..a1df3a5c0c2f 100644
--- a/lotuswordpro/inc/xfilter/xfdatestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfdatestyle.hxx
@@ -60,11 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATESTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATESTYLE_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfstyle.hxx>
 #include <xfilter/xftimestyle.hxx>
 #include <xfilter/xfstylecont.hxx>
-#include <vector>
 
 class XFDatePart : public XFTimePart
 {
diff --git a/lotuswordpro/inc/xfilter/xfdefs.hxx b/lotuswordpro/inc/xfilter/xfdefs.hxx
index 41e18c705b0c..0b552236a4ed 100644
--- a/lotuswordpro/inc/xfilter/xfdefs.hxx
+++ b/lotuswordpro/inc/xfilter/xfdefs.hxx
@@ -60,8 +60,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDEFS_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDEFS_HXX
 
-#include <sal/types.h>
-
 enum enumXFContent
 {
     enumXFContentUnknown,
diff --git a/lotuswordpro/inc/xfilter/xfdocfield.hxx b/lotuswordpro/inc/xfilter/xfdocfield.hxx
index 35710eec72eb..6582a33dda26 100644
--- a/lotuswordpro/inc/xfilter/xfdocfield.hxx
+++ b/lotuswordpro/inc/xfilter/xfdocfield.hxx
@@ -61,7 +61,6 @@
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDOCFIELD_HXX
 
 #include <xfilter/xfcontent.hxx>
-#include <xfilter/xfpagecount.hxx>
 
 class XFFileName : public XFContent
 {
diff --git a/lotuswordpro/inc/xfilter/xfdrawgroup.hxx b/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
index 60d561078e2d..746b8dca2acc 100644
--- a/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
@@ -63,6 +63,7 @@
 #include <xfilter/xfdrawobj.hxx>
 #include <xfilter/xfframe.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfdrawobj.hxx b/lotuswordpro/inc/xfilter/xfdrawobj.hxx
index ca597a9f0519..c18058adedad 100644
--- a/lotuswordpro/inc/xfilter/xfdrawobj.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawobj.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWOBJ_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWOBJ_HXX
 
+#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfframe.hxx>
-#include <xfilter/xfrect.hxx>
 
 #define     XFDRAWOBJECT_FLAG_ROTATE    0X00000001
 #define     XFDRAWOBJECT_FLAG_TRANSLATE 0X00000002
diff --git a/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx b/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx
index 901e5b6f67f9..8a04c1d61f36 100644
--- a/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx
@@ -61,7 +61,6 @@
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPOLYGON_HXX
 
 #include <xfilter/xfdrawpolyline.hxx>
-#include <vector>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfdropcap.hxx b/lotuswordpro/inc/xfilter/xfdropcap.hxx
index d5f9213a8212..eb5fb992ed22 100644
--- a/lotuswordpro/inc/xfilter/xfdropcap.hxx
+++ b/lotuswordpro/inc/xfilter/xfdropcap.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDROPCAP_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDROPCAP_HXX
 
-#include <xfilter/xfglobal.hxx>
-
+#include <xfilter/ixfattrlist.hxx>
+#include <xfilter/ixfstream.hxx>
 class XFDropcap
 {
 public:
diff --git a/lotuswordpro/inc/xfilter/xfendnote.hxx b/lotuswordpro/inc/xfilter/xfendnote.hxx
index 1d70943a0aa6..98bb280900f8 100644
--- a/lotuswordpro/inc/xfilter/xfendnote.hxx
+++ b/lotuswordpro/inc/xfilter/xfendnote.hxx
@@ -61,8 +61,8 @@
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENDNOTE_HXX
 
 #include <xfilter/xfglobal.hxx>
-#include <xfilter/xfcontent.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfendnoteconfig.hxx b/lotuswordpro/inc/xfilter/xfendnoteconfig.hxx
index 25f2c818260c..886a44e9f9ed 100644
--- a/lotuswordpro/inc/xfilter/xfendnoteconfig.hxx
+++ b/lotuswordpro/inc/xfilter/xfendnoteconfig.hxx
@@ -60,6 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENDNOTECONFIG_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENDNOTECONFIG_HXX
 
+#include <xfilter/xffootnoteconfig.hxx>
+
 class XFEndnoteConfig : public XFFootnoteConfig
 {
 public:
diff --git a/lotuswordpro/inc/xfilter/xffloatframe.hxx b/lotuswordpro/inc/xfilter/xffloatframe.hxx
index 9ca225d4017d..e6b973d01818 100644
--- a/lotuswordpro/inc/xfilter/xffloatframe.hxx
+++ b/lotuswordpro/inc/xfilter/xffloatframe.hxx
@@ -61,7 +61,6 @@
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFLOATFRAME_HXX
 
 #include <xfilter/xfframe.hxx>
-#include <vector>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xffont.hxx b/lotuswordpro/inc/xfilter/xffont.hxx
index 47067b3a59d2..f6b394e0769b 100644
--- a/lotuswordpro/inc/xfilter/xffont.hxx
+++ b/lotuswordpro/inc/xfilter/xffont.hxx
@@ -64,8 +64,9 @@
 
 #include <salhelper/simplereferenceobject.hxx>
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfstream.hxx>
 #include <xfilter/xfcolor.hxx>
+#include <xfilter/xfdefs.hxx>
 
 #define     XFFONT_FLAG_NAME            0X00000001
 #define     XFFONT_FLAG_NAME_ASIA       0X00000002
diff --git a/lotuswordpro/inc/xfilter/xffontdecl.hxx b/lotuswordpro/inc/xfilter/xffontdecl.hxx
index 2c3eeaad7164..18845f50ad2b 100644
--- a/lotuswordpro/inc/xfilter/xffontdecl.hxx
+++ b/lotuswordpro/inc/xfilter/xffontdecl.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFONTDECL_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFONTDECL_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <rtl/ustring.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xffontfactory.hxx b/lotuswordpro/inc/xfilter/xffontfactory.hxx
index df4827b70bfa..04ecffa0d55b 100644
--- a/lotuswordpro/inc/xfilter/xffontfactory.hxx
+++ b/lotuswordpro/inc/xfilter/xffontfactory.hxx
@@ -64,7 +64,6 @@
 
 #include <rtl/ref.hxx>
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xffont.hxx>
 #include <vector>
 
diff --git a/lotuswordpro/inc/xfilter/xffooter.hxx b/lotuswordpro/inc/xfilter/xffooter.hxx
index 9821154c53f5..30deea07aa4c 100644
--- a/lotuswordpro/inc/xfilter/xffooter.hxx
+++ b/lotuswordpro/inc/xfilter/xffooter.hxx
@@ -60,8 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTER_HXX
 
+#include <xfilter/ixfattrlist.hxx>
+#include <xfilter/ixfstream.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
-#include <vector>
 
 /**
  * @descr   Foot object. It's just a container.
diff --git a/lotuswordpro/inc/xfilter/xffootnote.hxx b/lotuswordpro/inc/xfilter/xffootnote.hxx
index 575860a9a7be..76f26c83e296 100644
--- a/lotuswordpro/inc/xfilter/xffootnote.hxx
+++ b/lotuswordpro/inc/xfilter/xffootnote.hxx
@@ -61,8 +61,8 @@
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTE_HXX
 
 #include <xfilter/xfglobal.hxx>
-#include <xfilter/xfcontent.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx b/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx
index 916c81c9f610..b24b3c2acddf 100644
--- a/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx
+++ b/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx
@@ -60,6 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTECONFIG_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTECONFIG_HXX
 
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfstyle.hxx>
 
 class XFFootnoteConfig : public XFStyle
diff --git a/lotuswordpro/inc/xfilter/xfframe.hxx b/lotuswordpro/inc/xfilter/xfframe.hxx
index 35f73d32587a..8b7ec196b0dc 100644
--- a/lotuswordpro/inc/xfilter/xfframe.hxx
+++ b/lotuswordpro/inc/xfilter/xfframe.hxx
@@ -61,7 +61,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAME_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAME_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfcontent.hxx>
 #include <xfilter/xfrect.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
diff --git a/lotuswordpro/inc/xfilter/xfframestyle.hxx b/lotuswordpro/inc/xfilter/xfframestyle.hxx
index 0af5e546637d..1ef4233180a3 100644
--- a/lotuswordpro/inc/xfilter/xfframestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfframestyle.hxx
@@ -61,7 +61,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAMESTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAMESTYLE_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfstyle.hxx>
 #include <xfilter/xfmargins.hxx>
 #include <xfilter/xfcolor.hxx>
diff --git a/lotuswordpro/inc/xfilter/xfglobal.hxx b/lotuswordpro/inc/xfilter/xfglobal.hxx
index 30bea2c5be94..d3bd4d3f15b1 100644
--- a/lotuswordpro/inc/xfilter/xfglobal.hxx
+++ b/lotuswordpro/inc/xfilter/xfglobal.hxx
@@ -61,18 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFGLOBAL_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFGLOBAL_HXX
 
-#include <cassert>
-
-#include <sal/types.h>
-
 #include <rtl/ustring.hxx>
 
-#include <xfilter/ixfstream.hxx>
-#include <xfilter/ixfattrlist.hxx>
-
-#include <xfilter/xfutil.hxx>
-#include <xfilter/xfdefs.hxx>
-
 #define PI 3.1415926
 #define FLOAT_MIN   0.001
 #define MAX2(a,b)    (((a) > (b)) ? (a) : (b))
diff --git a/lotuswordpro/inc/xfilter/xfheader.hxx b/lotuswordpro/inc/xfilter/xfheader.hxx
index 0d9b6bbf69f3..5b101518faac 100644
--- a/lotuswordpro/inc/xfilter/xfheader.hxx
+++ b/lotuswordpro/inc/xfilter/xfheader.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHEADER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHEADER_HXX
 
+#include <xfilter/ixfstream.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
-#include <xfilter/xfparagraph.hxx>
-#include <vector>
 
 class XFHeader : public XFContentContainer
 {
diff --git a/lotuswordpro/inc/xfilter/xfhyperlink.hxx b/lotuswordpro/inc/xfilter/xfhyperlink.hxx
index 15e49c14d71e..f44edab39817 100644
--- a/lotuswordpro/inc/xfilter/xfhyperlink.hxx
+++ b/lotuswordpro/inc/xfilter/xfhyperlink.hxx
@@ -60,6 +60,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHYPERLINK_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHYPERLINK_HXX
 
+#include <xfilter/ixfstream.hxx>
+#include <xfilter/ixfattrlist.hxx>
+#include <xfilter/xfcontent.hxx>
+
 class XFHyperlink : public XFContent
 {
 public:
diff --git a/lotuswordpro/inc/xfilter/xfimagestyle.hxx b/lotuswordpro/inc/xfilter/xfimagestyle.hxx
index 1bbf96a152c4..1601984fb2e4 100644
--- a/lotuswordpro/inc/xfilter/xfimagestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfimagestyle.hxx
@@ -61,7 +61,6 @@
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFIMAGESTYLE_HXX
 
 #include <xfilter/xfframestyle.hxx>
-#include <xfilter/xfrect.hxx>
 
 class XFImageStyle : public XFFrameStyle
 {
diff --git a/lotuswordpro/inc/xfilter/xfindex.hxx b/lotuswordpro/inc/xfilter/xfindex.hxx
index 453aa01c16f1..f5bbd717297b 100644
--- a/lotuswordpro/inc/xfilter/xfindex.hxx
+++ b/lotuswordpro/inc/xfilter/xfindex.hxx
@@ -64,7 +64,6 @@
 
 #include <xfilter/xfcontent.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
-#include <xfilter/xftabstop.hxx>
 #include <rtl/ref.hxx>
 
 class XFIndex;
diff --git a/lotuswordpro/inc/xfilter/xfinputlist.hxx b/lotuswordpro/inc/xfilter/xfinputlist.hxx
index 455522f41f1b..8a5a70e1c13d 100644
--- a/lotuswordpro/inc/xfilter/xfinputlist.hxx
+++ b/lotuswordpro/inc/xfilter/xfinputlist.hxx
@@ -60,7 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFINPUTLIST_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFINPUTLIST_HXX
 
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfcontent.hxx>
+#include <vector>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xflinebreak.hxx b/lotuswordpro/inc/xfilter/xflinebreak.hxx
index 5267b4e157b3..a5fc5054bd31 100644
--- a/lotuswordpro/inc/xfilter/xflinebreak.hxx
+++ b/lotuswordpro/inc/xfilter/xflinebreak.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINEBREAK_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINEBREAK_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfcontent.hxx>
 
 class XFLineBreak : public XFContent
diff --git a/lotuswordpro/inc/xfilter/xflineheight.hxx b/lotuswordpro/inc/xfilter/xflineheight.hxx
index f03fd93e667d..cffff2457226 100644
--- a/lotuswordpro/inc/xfilter/xflineheight.hxx
+++ b/lotuswordpro/inc/xfilter/xflineheight.hxx
@@ -60,7 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINEHEIGHT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINEHEIGHT_HXX
 
-#include <string.h>
+#include <xfilter/ixfstream.hxx>
+#include <xfilter/ixfattrlist.hxx>
+#include <xfilter/xfdefs.hxx>
 
 class XFLineHeight
 {
diff --git a/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx b/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx
index 46ab46e01aaf..5c0516bce940 100644
--- a/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx
+++ b/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx
@@ -60,6 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINENUMBERCONFIG_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINENUMBERCONFIG_HXX
 
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfstyle.hxx>
 
 class XFLineNumberConfig : public XFStyle
diff --git a/lotuswordpro/inc/xfilter/xflist.hxx b/lotuswordpro/inc/xfilter/xflist.hxx
index 4f2e1f01e22b..bd95e84efa0d 100644
--- a/lotuswordpro/inc/xfilter/xflist.hxx
+++ b/lotuswordpro/inc/xfilter/xflist.hxx
@@ -60,7 +60,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLIST_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLIST_HXX
 
-#include "xflistitem.hxx"
 #include <xfilter/xfcontentcontainer.hxx>
 
 class XFListItem;
diff --git a/lotuswordpro/inc/xfilter/xflistitem.hxx b/lotuswordpro/inc/xfilter/xflistitem.hxx
index bc11fb129f37..228176217673 100644
--- a/lotuswordpro/inc/xfilter/xflistitem.hxx
+++ b/lotuswordpro/inc/xfilter/xflistitem.hxx
@@ -60,9 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTITEM_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTITEM_HXX
 
-#include <xfilter/xfcontent.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
-#include <xfilter/xfparagraph.hxx>
 
 class   XFListItem : public XFContentContainer
 {
diff --git a/lotuswordpro/inc/xfilter/xfliststyle.hxx b/lotuswordpro/inc/xfilter/xfliststyle.hxx
index 3cde9644a612..9937ea85a013 100644
--- a/lotuswordpro/inc/xfilter/xfliststyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfliststyle.hxx
@@ -60,12 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTSTYLE_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfstyle.hxx>
 #include <xfilter/xfnumfmt.hxx>
-#include <unicode/utypes.h>
 #include <memory>
-#include <vector>
 
 class IXFStream;
 
diff --git a/lotuswordpro/inc/xfilter/xfmargins.hxx b/lotuswordpro/inc/xfilter/xfmargins.hxx
index 0ee890c7f9d8..0eafc0a46d78 100644
--- a/lotuswordpro/inc/xfilter/xfmargins.hxx
+++ b/lotuswordpro/inc/xfilter/xfmargins.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMARGINS_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMARGINS_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfstream.hxx>
 
 #define     XFMARGINS_FLAG_LEFT     0x00000001
 #define     XFMARGINS_FLAG_RIGHT    0x00000002
diff --git a/lotuswordpro/inc/xfilter/xfmasterpage.hxx b/lotuswordpro/inc/xfilter/xfmasterpage.hxx
index 649aca9c57af..dfb10dea0da0 100644
--- a/lotuswordpro/inc/xfilter/xfmasterpage.hxx
+++ b/lotuswordpro/inc/xfilter/xfmasterpage.hxx
@@ -61,7 +61,8 @@
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMASTERPAGE_HXX
 
 #include <xfilter/xfstyle.hxx>
-#include <xfilter/xfcontentcontainer.hxx>
+#include <xfilter/xfheader.hxx>
+#include <xfilter/xffooter.hxx>
 
 class XFFooter;
 class XFHeader;
diff --git a/lotuswordpro/inc/xfilter/xfnumberstyle.hxx b/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
index cea69c1f9010..6b1fd9f0dfbe 100644
--- a/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
@@ -61,7 +61,6 @@
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMBERSTYLE_HXX
 
 #include <xfilter/xfstyle.hxx>
-#include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xfcolor.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/lotuswordpro/inc/xfilter/xfnumfmt.hxx b/lotuswordpro/inc/xfilter/xfnumfmt.hxx
index 3e3f70d370a1..da4a866ecd15 100644
--- a/lotuswordpro/inc/xfilter/xfnumfmt.hxx
+++ b/lotuswordpro/inc/xfilter/xfnumfmt.hxx
@@ -60,7 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMFMT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMFMT_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfstream.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfofficemeta.hxx b/lotuswordpro/inc/xfilter/xfofficemeta.hxx
index 0b6334a5e51a..a183ab793753 100644
--- a/lotuswordpro/inc/xfilter/xfofficemeta.hxx
+++ b/lotuswordpro/inc/xfilter/xfofficemeta.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFOFFICEMETA_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFOFFICEMETA_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfstream.hxx>
 
 class XFOfficeMeta final
 {
diff --git a/lotuswordpro/inc/xfilter/xfpadding.hxx b/lotuswordpro/inc/xfilter/xfpadding.hxx
index 10b639a605a1..69e30723b822 100644
--- a/lotuswordpro/inc/xfilter/xfpadding.hxx
+++ b/lotuswordpro/inc/xfilter/xfpadding.hxx
@@ -60,7 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPADDING_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPADDING_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfstream.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 #define XFPADDING_FLAG_LEFT     0X00000001
 #define XFPADDING_FLAG_RIGHT    0X00000002
diff --git a/lotuswordpro/inc/xfilter/xfpagecount.hxx b/lotuswordpro/inc/xfilter/xfpagecount.hxx
index 8344d2abd1f0..00f9ed708971 100644
--- a/lotuswordpro/inc/xfilter/xfpagecount.hxx
+++ b/lotuswordpro/inc/xfilter/xfpagecount.hxx
@@ -60,9 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGECOUNT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGECOUNT_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfcontent.hxx>
-#include <xfilter/xfnumfmt.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfpagemaster.hxx b/lotuswordpro/inc/xfilter/xfpagemaster.hxx
index 40d19074af58..3864cfdda855 100644
--- a/lotuswordpro/inc/xfilter/xfpagemaster.hxx
+++ b/lotuswordpro/inc/xfilter/xfpagemaster.hxx
@@ -61,7 +61,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGEMASTER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGEMASTER_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfstyle.hxx>
 #include <xfilter/xfcolor.hxx>
 #include <xfilter/xfmargins.hxx>
diff --git a/lotuswordpro/inc/xfilter/xfpagenumber.hxx b/lotuswordpro/inc/xfilter/xfpagenumber.hxx
index 9e051764a852..aa63530a1e4a 100644
--- a/lotuswordpro/inc/xfilter/xfpagenumber.hxx
+++ b/lotuswordpro/inc/xfilter/xfpagenumber.hxx
@@ -60,7 +60,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGENUMBER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGENUMBER_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfcontent.hxx>
 #include <xfilter/xfnumfmt.hxx>
 
diff --git a/lotuswordpro/inc/xfilter/xfparagraph.hxx b/lotuswordpro/inc/xfilter/xfparagraph.hxx
index f7c1fd9da2e6..e53399272b2c 100644
--- a/lotuswordpro/inc/xfilter/xfparagraph.hxx
+++ b/lotuswordpro/inc/xfilter/xfparagraph.hxx
@@ -60,9 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPARAGRAPH_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPARAGRAPH_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfcontentcontainer.hxx>
-#include <vector>
 
 class IXFStream;
 
diff --git a/lotuswordpro/inc/xfilter/xfparastyle.hxx b/lotuswordpro/inc/xfilter/xfparastyle.hxx
index f43c4fd4dba7..339f6a3c7fff 100644
--- a/lotuswordpro/inc/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfparastyle.hxx
@@ -67,7 +67,6 @@
 #include <rtl/ref.hxx>
 
 #include <xfilter/xffont.hxx>
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfstyle.hxx>
 #include <xfilter/xfcolor.hxx>
 #include <xfilter/xfmargins.hxx>
diff --git a/lotuswordpro/inc/xfilter/xfplaceholder.hxx b/lotuswordpro/inc/xfilter/xfplaceholder.hxx
index 2d4f65a138c4..1e730a8fe1a2 100644
--- a/lotuswordpro/inc/xfilter/xfplaceholder.hxx
+++ b/lotuswordpro/inc/xfilter/xfplaceholder.hxx
@@ -60,6 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPLACEHOLDER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPLACEHOLDER_HXX
 
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfcontent.hxx>
 
 /**
diff --git a/lotuswordpro/inc/xfilter/xfrow.hxx b/lotuswordpro/inc/xfilter/xfrow.hxx
index d8269057bb82..009bdad95326 100644
--- a/lotuswordpro/inc/xfilter/xfrow.hxx
+++ b/lotuswordpro/inc/xfilter/xfrow.hxx
@@ -60,6 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFROW_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFROW_HXX
 
+#include <xfilter/xfcell.hxx>
 #include <xfilter/xfcontent.hxx>
 #include <rtl/ref.hxx>
 #include <map>
diff --git a/lotuswordpro/inc/xfilter/xfruby.hxx b/lotuswordpro/inc/xfilter/xfruby.hxx
index e5be9f30c92b..d481d4758cf8 100644
--- a/lotuswordpro/inc/xfilter/xfruby.hxx
+++ b/lotuswordpro/inc/xfilter/xfruby.hxx
@@ -60,6 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBY_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBY_HXX
 
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfcontent.hxx>
 
 class XFRubyStart : public XFContent
diff --git a/lotuswordpro/inc/xfilter/xfrubystyle.hxx b/lotuswordpro/inc/xfilter/xfrubystyle.hxx
index 3789fba7c73b..184e7126a7e5 100644
--- a/lotuswordpro/inc/xfilter/xfrubystyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfrubystyle.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBYSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBYSTYLE_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfstyle.hxx>
 #include <xfilter/xfdefs.hxx>
 
diff --git a/lotuswordpro/inc/xfilter/xfsaxstream.hxx b/lotuswordpro/inc/xfilter/xfsaxstream.hxx
index 758c97a2903d..e86f817ab89e 100644
--- a/lotuswordpro/inc/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/inc/xfilter/xfsaxstream.hxx
@@ -63,12 +63,7 @@
 #include <xfilter/ixfstream.hxx>
 #include <memory>
 
-#include <cppuhelper/factory.hxx>
-#include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
 
 class XFSaxAttrList;
 class IXFAttrList;
diff --git a/lotuswordpro/inc/xfilter/xfsection.hxx b/lotuswordpro/inc/xfilter/xfsection.hxx
index 2620da2cfb0d..a855c6e89e5c 100644
--- a/lotuswordpro/inc/xfilter/xfsection.hxx
+++ b/lotuswordpro/inc/xfilter/xfsection.hxx
@@ -61,9 +61,6 @@
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTION_HXX
 
 #include <xfilter/xfcontentcontainer.hxx>
-#include <xfilter/xfcontent.hxx>
-#include <xfilter/xfcolor.hxx>
-#include <vector>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfsectionstyle.hxx b/lotuswordpro/inc/xfilter/xfsectionstyle.hxx
index 2906ea132c28..f112ab33f944 100644
--- a/lotuswordpro/inc/xfilter/xfsectionstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfsectionstyle.hxx
@@ -60,9 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTIONSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTIONSTYLE_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfstyle.hxx>
-#include <xfilter/xfbgimage.hxx>
 #include <xfilter/xfcolor.hxx>
 #include <memory>
 
diff --git a/lotuswordpro/inc/xfilter/xfshadow.hxx b/lotuswordpro/inc/xfilter/xfshadow.hxx
index b1f770c38b12..19b74c7fbd24 100644
--- a/lotuswordpro/inc/xfilter/xfshadow.hxx
+++ b/lotuswordpro/inc/xfilter/xfshadow.hxx
@@ -60,8 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSHADOW_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSHADOW_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfstream.hxx>
 #include <xfilter/xfcolor.hxx>
+#include <xfilter/xfdefs.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfstylecont.hxx b/lotuswordpro/inc/xfilter/xfstylecont.hxx
index 0ddf5ca4db80..5418f9a88d71 100644
--- a/lotuswordpro/inc/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/inc/xfilter/xfstylecont.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLECONT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLECONT_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfstyle.hxx>
 #include <vector>
 #include <memory>
 
diff --git a/lotuswordpro/inc/xfilter/xfstylemanager.hxx b/lotuswordpro/inc/xfilter/xfstylemanager.hxx
index 163ceafad865..d2de7b5759b9 100644
--- a/lotuswordpro/inc/xfilter/xfstylemanager.hxx
+++ b/lotuswordpro/inc/xfilter/xfstylemanager.hxx
@@ -60,11 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLEMANAGER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLEMANAGER_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xffontdecl.hxx>
 #include <xfilter/xfstylecont.hxx>
 #include <xfilter/xfconfigmanager.hxx>
-#include <map>
 #include <vector>
 
 class IXFStream;
diff --git a/lotuswordpro/inc/xfilter/xftabstop.hxx b/lotuswordpro/inc/xfilter/xftabstop.hxx
index ebdfc8adca44..2f5ad893072d 100644
--- a/lotuswordpro/inc/xfilter/xftabstop.hxx
+++ b/lotuswordpro/inc/xfilter/xftabstop.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABSTOP_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABSTOP_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfcontent.hxx>
 
 class XFTabStop : public XFContent
diff --git a/lotuswordpro/inc/xfilter/xftextboxstyle.hxx b/lotuswordpro/inc/xfilter/xftextboxstyle.hxx
index 23d100321573..e1b5bbaf1683 100644
--- a/lotuswordpro/inc/xfilter/xftextboxstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftextboxstyle.hxx
@@ -56,11 +56,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTBOXSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTBOXSTYLE_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfstyle.hxx>
-#include <xfilter/xfmargins.hxx>
-#include <xfilter/xfcolor.hxx>
-#include <xfilter/xfpadding.hxx>
 
 /**
 * @brief
diff --git a/lotuswordpro/inc/xfilter/xftextcontent.hxx b/lotuswordpro/inc/xfilter/xftextcontent.hxx
index c0c6050f67bc..dca2c69c2b99 100644
--- a/lotuswordpro/inc/xfilter/xftextcontent.hxx
+++ b/lotuswordpro/inc/xfilter/xftextcontent.hxx
@@ -57,7 +57,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTCONTENT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTCONTENT_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfcontent.hxx>
 
 class IXFStream;
diff --git a/lotuswordpro/inc/xfilter/xftextspan.hxx b/lotuswordpro/inc/xfilter/xftextspan.hxx
index 500d002174d3..2e210f357209 100644
--- a/lotuswordpro/inc/xfilter/xftextspan.hxx
+++ b/lotuswordpro/inc/xfilter/xftextspan.hxx
@@ -66,7 +66,6 @@
 
 #include <rtl/ref.hxx>
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfcontent.hxx>
 
 class IXFStream;
diff --git a/lotuswordpro/inc/xfilter/xftextstyle.hxx b/lotuswordpro/inc/xfilter/xftextstyle.hxx
index 50d73fe7ad3f..2774426d7bcd 100644
--- a/lotuswordpro/inc/xfilter/xftextstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftextstyle.hxx
@@ -65,7 +65,6 @@
 
 #include <rtl/ref.hxx>
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfstyle.hxx>
 
 class   IXFStream;
diff --git a/lotuswordpro/inc/xfilter/xftimestyle.hxx b/lotuswordpro/inc/xfilter/xftimestyle.hxx
index b25936c667b2..f27637cb62ef 100644
--- a/lotuswordpro/inc/xfilter/xftimestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftimestyle.hxx
@@ -60,7 +60,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTIMESTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTIMESTYLE_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfstyle.hxx>
 #include <vector>
 
diff --git a/lotuswordpro/inc/xfilter/xfutil.hxx b/lotuswordpro/inc/xfilter/xfutil.hxx
index 40da6bdd5cb8..8d2f9225cb49 100644
--- a/lotuswordpro/inc/xfilter/xfutil.hxx
+++ b/lotuswordpro/inc/xfilter/xfutil.hxx
@@ -63,7 +63,6 @@
 
 #include <xfilter/xfdefs.hxx>
 #include <rtl/ustring.hxx>
-#include <string>
 
 OUString   GetTableColName(sal_Int32 col);