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

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

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

61 files changed, 26 insertions, 216 deletions

diff --git a/lotuswordpro/IwyuFilter_lotuswordpro.yaml b/lotuswordpro/IwyuFilter_lotuswordpro.yaml
index fc8feffb209c..9654832768b5 100644
--- a/lotuswordpro/IwyuFilter_lotuswordpro.yaml
+++ b/lotuswordpro/IwyuFilter_lotuswordpro.yaml
@@ -112,3 +112,12 @@ blacklist:
     lotuswordpro/source/filter/lwpusrdicts.hxx:
     # Needed for MPL subset
     - config_lgpl.h
+    lotuswordpro/source/filter/LotusWordProImportFilter.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    lotuswordpro/source/filter/lwppara1.cxx:
+    # Needed for boost::polymorphic_downcast
+    - boost/cast.hpp
+    lotuswordpro/source/filter/xfilter/xfsaxstream.cxx:
+    # Actually used
+    - com/sun/star/xml/sax/XDocumentHandler.hpp
diff --git a/lotuswordpro/qa/cppunit/import_test.cxx b/lotuswordpro/qa/cppunit/import_test.cxx
index 8ffddc2153c1..6c629cb6031b 100644
--- a/lotuswordpro/qa/cppunit/import_test.cxx
+++ b/lotuswordpro/qa/cppunit/import_test.cxx
@@ -15,17 +15,13 @@
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <comphelper/processfactory.hxx>
-
 using namespace ::com::sun::star;
 
 class LotusWordProTest : public test::BootstrapFixture, public unotest::MacrosTest
diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
index 961faa668a36..e5648900841e 100644
--- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
+++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
@@ -11,9 +11,6 @@
 #include <test/bootstrapfixture.hxx>
 #include <com/sun/star/document/XFilter.hpp>
 
-#include <osl/file.hxx>
-#include <osl/process.h>
-
 using namespace ::com::sun::star;
 
 namespace
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 2c4f92c3e706..9d65394bae8c 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -23,12 +23,9 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
-#include <rtl/tencinfo.h>
 #include <sal/macros.h>
 #include <tools/stream.hxx>
-#include <vector>
 #include <ucbhelper/content.hxx>
-#include <xmloff/attrlist.hxx>
 
 #include "LotusWordProImportFilter.hxx"
 #include "lwpfilter.hxx"
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index ca63a961e197..459467c1a02f 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -55,11 +55,10 @@
  ************************************************************************/
 #include "first.hxx"
 #include "tocread.hxx"
-#include <assert.h>
 #include <stdio.h>
 #include <algorithm>
 #include <osl/diagnose.h>
-#include <sot/storinfo.hxx>
+
 namespace OpenStormBento
 {
 
diff --git a/lotuswordpro/source/filter/benname.cxx b/lotuswordpro/source/filter/benname.cxx
index 9cdfd5b7c2f7..d65799ce203c 100644
--- a/lotuswordpro/source/filter/benname.cxx
+++ b/lotuswordpro/source/filter/benname.cxx
@@ -53,7 +53,7 @@
  *
  *
  ************************************************************************/
-#include "first.hxx"
+#include "bento.hxx"
 
 namespace OpenStormBento
 {
diff --git a/lotuswordpro/source/filter/benval.cxx b/lotuswordpro/source/filter/benval.cxx
index 2d93626ececd..ec60c8c0e5ac 100644
--- a/lotuswordpro/source/filter/benval.cxx
+++ b/lotuswordpro/source/filter/benval.cxx
@@ -59,8 +59,8 @@
 #include <algorithm>
 #include <cstring>
 
-#include "first.hxx"
-#include <assert.h>
+#include "bento.hxx"
+
 namespace OpenStormBento
 {
 
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index e278fc8e1a88..347f879c97f8 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -61,9 +61,7 @@
 #include "lwpdoc.hxx"
 #include <xfilter/xfstylemanager.hxx>
 #include <lwpdocdata.hxx>
-#include <lwpbookmarkmgr.hxx>
 #include <lwpchangemgr.hxx>
-#include <tools/stream.hxx>
 
 Lwp9Reader::Lwp9Reader (LwpSvStream* pInputStream, IXFStream* pStream)
     : m_pDocStream(pInputStream)
diff --git a/lotuswordpro/source/filter/lwpatomholder.cxx b/lotuswordpro/source/filter/lwpatomholder.cxx
index bd28e0b4d2a2..d1ca92cb1377 100644
--- a/lotuswordpro/source/filter/lwpatomholder.cxx
+++ b/lotuswordpro/source/filter/lwpatomholder.cxx
@@ -55,7 +55,6 @@
  ************************************************************************/
 #include <lwpatomholder.hxx>
 #include <lwptools.hxx>
-#include <osl/thread.h>
 #include <rtl/textenc.h>
 
 LwpAtomHolder::LwpAtomHolder()
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 6f5b638c8fea..d22a234ece60 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -60,9 +60,6 @@
 
 #include "lwpbulletstylemgr.hxx"
 #include "lwpfribheader.hxx"
-#include "lwpdoc.hxx"
-#include "lwpstory.hxx"
-#include "lwpdivinfo.hxx"
 #include "lwppara.hxx"
 #include "lwpsilverbullet.hxx"
 #include <lwptools.hxx>
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index ddf04483817c..cd8d49d7519b 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -60,11 +60,6 @@
 
 #include <memory>
 #include "lwpcelllayout.hxx"
-#include <lwpfoundry.hxx>
-#include <lwpobjfactory.hxx>
-#include "lwptblcell.hxx"
-#include "lwptblformula.hxx"
-#include "lwpholder.hxx"
 #include "lwpnumericfmt.hxx"
 #include "lwptable.hxx"
 #include "lwprowlayout.hxx"
diff --git a/lotuswordpro/source/filter/lwpchangemgr.cxx b/lotuswordpro/source/filter/lwpchangemgr.cxx
index f24c1ddf72cb..ee8c8f8dd8df 100644
--- a/lotuswordpro/source/filter/lwpchangemgr.cxx
+++ b/lotuswordpro/source/filter/lwpchangemgr.cxx
@@ -60,26 +60,8 @@
 
 #include <lwpchangemgr.hxx>
 #include <rtl/ustring.hxx>
-#include "lwppara.hxx"
-#include "lwpfribheader.hxx"
-#include "lwpfribptr.hxx"
 #include <lwpfrib.hxx>
-#include "lwpstory.hxx"
-#include "lwpfribsection.hxx"
-#include "lwpsection.hxx"
-#include "lwpfribbreaks.hxx"
-#include "lwpfribframe.hxx"
-#include "lwpfribtable.hxx"
-#include "lwphyperlinkmgr.hxx"
-#include "lwpfootnote.hxx"
-#include "lwpnotes.hxx"
-#include "lwpfribmark.hxx"
-#include <xfilter/xftextspan.hxx>
-#include <xfilter/xftextcontent.hxx>
-#include <xfilter/xftabstop.hxx>
-#include <xfilter/xflinebreak.hxx>
-#include <xfilter/xfstylemanager.hxx>
-#include <xfilter/xfhyperlink.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
 LwpChangeMgr::LwpChangeMgr()
 {
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
index da393770d06e..07034de5381b 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
@@ -60,13 +60,11 @@
 
 #include "lwpcharacterstyle.hxx"
 #include <lwpfilehdr.hxx>
-#include <lwptools.hxx>
 #include <lwpoverride.hxx>
 #include <lwpatomholder.hxx>
 #include <lwpfont.hxx>
 #include <lwpfoundry.hxx>
 #include "lwpcharborderoverride.hxx"
-#include <xfilter/xfparastyle.hxx>
 #include <xfilter/xffont.hxx>
 #include <xfilter/xftextstyle.hxx>
 
diff --git a/lotuswordpro/source/filter/lwpcontent.cxx b/lotuswordpro/source/filter/lwpcontent.cxx
index 164038a1d58c..f4f16484303b 100644
--- a/lotuswordpro/source/filter/lwpcontent.cxx
+++ b/lotuswordpro/source/filter/lwpcontent.cxx
@@ -58,9 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpstory.hxx"
+#include "lwpcontent.hxx"
 #include <lwpfilehdr.hxx>
-#include "lwpholder.hxx"
 
 LwpHeadContent::LwpHeadContent(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpContent(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index f59c41827b22..df248a5757e7 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -61,7 +61,6 @@
 #include "lwpholder.hxx"
 #include "lwpparastyle.hxx"
 #include "lwpstory.hxx"
-#include "lwppara.hxx"
 #include "lwpsilverbullet.hxx"
 #include "lwpsortopt.hxx"
 #include "lwplayout.hxx"
@@ -72,7 +71,6 @@
 #include "lwpverdocument.hxx"
 #include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfstylemanager.hxx>
-#include <osl/thread.h>
 #include <o3tl/sorted_vector.hxx>
 
 LwpDocument::LwpDocument(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx
index e887515248ad..833a17db46d1 100644
--- a/lotuswordpro/source/filter/lwpdocdata.cxx
+++ b/lotuswordpro/source/filter/lwpdocdata.cxx
@@ -57,7 +57,6 @@
 #include <lwpdocdata.hxx>
 #include <xfilter/xfofficemeta.hxx>
 #include <localtime.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <lwpfilehdr.hxx>
 #include <lwpglobalmgr.hxx>
 
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 38e8c3162f08..552bf7aab2ba 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -68,12 +68,10 @@
 
 #include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xfdrawstyle.hxx>
-#include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfparastyle.hxx>
 #include <xfilter/xfimagestyle.hxx>
 #include <xfilter/xftextboxstyle.hxx>
 #include <xfilter/xfparagraph.hxx>
-#include <xfilter/xftextspan.hxx>
 #include <xfilter/xffont.hxx>
 
 #include <xfilter/xfdrawrect.hxx>
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 6f95fb651f64..a86fc4368204 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -58,26 +58,14 @@
  * Circle object.
  ************************************************************************/
 #include "lwpfilter.hxx"
-#include "lwpresource.hxx"
 #include <xfilter/xfglobal.hxx>
 #include <xfilter/xfsaxstream.hxx>
 #include "lwp9reader.hxx"
 #include <lwpsvstream.hxx>
-#include <xfilter/xffontfactory.hxx>
-#include <xfilter/xfstylemanager.hxx>
 
-#include <osl/file.h>
-#include <osl/file.hxx>
 #include <tools/stream.hxx>
-#include <vcl/svapp.hxx>
-#include <xmloff/attrlist.hxx>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XText.hpp>
-
-#include <cppuhelper/supportsservice.hxx>
-
-#include <sfx2/docfile.hxx>
 
 #include <memory>
 
diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index f8d807757778..92a4d76dc28f 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -57,8 +57,6 @@
 #include <lwpfont.hxx>
 #include <lwpbasetype.hxx>
 #include <xfilter/xfstylemanager.hxx>
-#include <xfilter/xffontfactory.hxx>
-#include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfdefs.hxx>
 #include <xfilter/xfcolor.hxx>
 #include <sal/log.hxx>
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx
index 17567226326f..0d9ec19a111f 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -56,7 +56,6 @@
 
 #include <memory>
 #include "lwpfootnote.hxx"
-#include "lwpstory.hxx"
 #include <xfilter/xffootnote.hxx>
 #include <xfilter/xfendnote.hxx>
 #include <xfilter/xffootnoteconfig.hxx>
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx
index ce6b8f33d08f..2a17efbe8ae2 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -71,7 +71,6 @@
 #include <lwpglobalmgr.hxx>
 #include <lwpobjtags.hxx>
 #include <xfilter/xfstylemanager.hxx>
-#include "lwplayout.hxx"
 
 #include <osl/diagnose.h>
 
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index dc873d16774e..01be3544108d 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -60,16 +60,13 @@
 
 #include <memory>
 #include <lwpfilehdr.hxx>
+#include "lwpcelllayout.hxx"
 #include "lwpframelayout.hxx"
 #include "lwppara.hxx"
 #include <xfilter/xfstylemanager.hxx>
-#include <xfilter/xfparagraph.hxx>
 #include <xfilter/xffloatframe.hxx>
 #include <xfilter/xfrubystyle.hxx>
-#include "lwppagelayout.hxx"
 #include "lwpoleobject.hxx"
-#include "lwptablelayout.hxx"
-#include "lwpgrfobj.hxx"
 #include <lwpglobalmgr.hxx>
 
 LwpFrame::LwpFrame(LwpPlacableLayout* pLayout):m_pLayout(pLayout)
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index 37684d7d703e..b8d42a680153 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -60,13 +60,9 @@
 
 #include <memory>
 #include <lwpfrib.hxx>
-#include "lwpcharsetmgr.hxx"
-#include "lwpsection.hxx"
 #include "lwphyperlinkmgr.hxx"
 #include <xfilter/xfhyperlink.hxx>
 #include <xfilter/xfstylemanager.hxx>
-#include <xfilter/xfsection.hxx>
-#include <xfilter/xfsectionstyle.hxx>
 #include <xfilter/xftextspan.hxx>
 #include <xfilter/xftextstyle.hxx>
 #include <xfilter/xftextcontent.hxx>
@@ -80,8 +76,6 @@
 #include "lwpfootnote.hxx"
 #include "lwpnotes.hxx"
 #include "lwpfribmark.hxx"
-#include <lwpchangemgr.hxx>
-#include <lwpdocdata.hxx>
 #include <lwpglobalmgr.hxx>
 
 #include <osl/diagnose.h>
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.cxx b/lotuswordpro/source/filter/lwpfribbreaks.cxx
index cf9801275556..8afc98eb1d1a 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.cxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.cxx
@@ -60,11 +60,9 @@
 
 #include "lwpfribbreaks.hxx"
 #include "lwpfribheader.hxx"
+#include "lwppagelayout.hxx"
 #include "lwpstory.hxx"
 #include <xfilter/xfstylemanager.hxx>
-#include <xfilter/xfsectionstyle.hxx>
-#include "lwpsection.hxx"
-#include <xfilter/xfsection.hxx>
 #include <lwpglobalmgr.hxx>
 
 void LwpFribColumnBreak::RegisterBreakStyle(LwpPara * pPara)
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index f41f5b0e7d2d..3b2f82395786 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -65,7 +65,6 @@
 #include "lwppara.hxx"
 #include "lwpstory.hxx"
 #include <xfilter/xftextspan.hxx>
-#include <xfilter/xftextcontent.hxx>
 #include <xfilter/xftabstop.hxx>
 #include <xfilter/xflinebreak.hxx>
 #include "lwpfribsection.hxx"
@@ -76,7 +75,6 @@
 #include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfstylemanager.hxx>
 #include "lwphyperlinkmgr.hxx"
-#include <xfilter/xfhyperlink.hxx>
 #include "lwpfootnote.hxx"
 #include "lwpnotes.hxx"
 #include "lwpfribmark.hxx"
diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx
index a3ada1578e01..64399464143f 100644
--- a/lotuswordpro/source/filter/lwpfribsection.cxx
+++ b/lotuswordpro/source/filter/lwpfribsection.cxx
@@ -59,7 +59,6 @@
  ************************************************************************/
 
 #include "lwpfribsection.hxx"
-#include "lwpfribbreaks.hxx"
 #include "lwpstory.hxx"
 #include "lwpsection.hxx"
 #include <xfilter/xfstylemanager.hxx>
diff --git a/lotuswordpro/source/filter/lwpfribtext.cxx b/lotuswordpro/source/filter/lwpfribtext.cxx
index 51a941c47f5a..b48050be6b42 100644
--- a/lotuswordpro/source/filter/lwpfribtext.cxx
+++ b/lotuswordpro/source/filter/lwpfribtext.cxx
@@ -65,16 +65,10 @@
 #include <lwptools.hxx>
 #include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xftextspan.hxx>
-#include <xfilter/xfbookmark.hxx>
-#include <xfilter/xfentry.hxx>
-#include <xfilter/xftextcontent.hxx>
-#include <xfilter/xfcrossref.hxx>
 #include <xfilter/xfpagenumber.hxx>
 #include <xfilter/xfdocfield.hxx>
 #include <xfilter/xfdatestyle.hxx>
 #include <xfilter/xftimestyle.hxx>
-#include <xfilter/xfdate.hxx>
-#include <xfilter/xfannotation.hxx>
 #include <xfilter/xfpagecount.hxx>
 
 LwpFribText::LwpFribText( LwpPara *pPara, bool bNoUnicode )
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index efb93ab32f72..8d32472ac0c7 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -62,7 +62,7 @@
 
 #include <memory>
 
-#include "lwp9reader.hxx"
+#include <lwpfilehdr.hxx>
 #include "lwpgrfobj.hxx"
 #include "lwpsdwfileloader.hxx"
 #include "bento.hxx"
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index c68f1326e02f..676339160e1d 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -68,8 +68,6 @@
 #include "lwpparastyle.hxx"
 #include "lwpholder.hxx"
 #include "lwpdoc.hxx"
-#include "lwppagehint.hxx"
-#include "lwpdivinfo.hxx"
 #include "lwpgrfobj.hxx"
 #include <lwpfilehdr.hxx>
 #include <osl/thread.h>
diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx
index 9f71b3e7bab7..7433042849b2 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -58,7 +58,6 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include <lwpfoundry.hxx>
 #include <lwpfilehdr.hxx>
 #include "lwpstory.hxx"
 #include "lwpmarker.hxx"
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index 2b0b056e4675..72db1c7a4346 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -81,7 +81,6 @@
 #include "lwptblcell.hxx"
 #include "lwpmarker.hxx"
 #include "lwpproplist.hxx"
-#include <new>
 #include "lwpframelayout.hxx"
 #include "lwptablelayout.hxx"
 #include "lwppagelayout.hxx"
diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx b/lotuswordpro/source/filter/lwpoleobject.cxx
index ed500545fd5c..92e3154f0632 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -58,17 +58,10 @@
  *  For LWP filter architecture prototype - OLE object
  */
 
-#include <tools/stream.hxx>
-#include <lwpglobalmgr.hxx>
+#include <lwpfilehdr.hxx>
 #include "lwpoleobject.hxx"
-#include <lwpobjfactory.hxx>
-#include <lwpidxmgr.hxx>
-#include "lwp9reader.hxx"
-#include <xfilter/xfparagraph.hxx>
 #include "lwpframelayout.hxx"
 #include <o3tl/numeric.hxx>
-#include <xfilter/xfstylemanager.hxx>
-#include "bento.hxx"
 
 /**
  * @descr:   construction function
diff --git a/lotuswordpro/source/filter/lwpoverride.cxx b/lotuswordpro/source/filter/lwpoverride.cxx
index 5201a2dc7be8..be190b7c8780 100644
--- a/lotuswordpro/source/filter/lwpoverride.cxx
+++ b/lotuswordpro/source/filter/lwpoverride.cxx
@@ -64,9 +64,6 @@
 #include "clone.hxx"
 #include <lwpoverride.hxx>
 #include <lwpfilehdr.hxx>
-#include <lwpatomholder.hxx>
-#include "lwpborderstuff.hxx"
-#include "lwpmargins.hxx"
 #include "lwpbackgroundstuff.hxx"
 
 /*class LwpOverride*/
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index d154be4ae38d..0b587c8d0ed6 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -71,11 +71,11 @@
 #include <xfilter/xfheaderstyle.hxx>
 #include <xfilter/xffooterstyle.hxx>
 #include <xfilter/xffooter.hxx>
-#include <sfx2/printer.hxx>
 #include <lwpchangemgr.hxx>
 #include <lwpfilehdr.hxx>
 #include <lwpglobalmgr.hxx>
 #include <sal/log.hxx>
+#include <vcl/print.hxx>
 
 LwpPageLayout::LwpPageLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpLayout(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 6dfe95bb1b28..7788132793ff 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -61,41 +61,23 @@
 #include "lwppara.hxx"
 #include <lwpglobalmgr.hxx>
 #include <lwpfilehdr.hxx>
+#include "lwppagelayout.hxx"
 #include "lwpparaproperty.hxx"
-#include <lwptools.hxx>
 #include "lwpparastyle.hxx"
-#include <xfilter/xffont.hxx>
-#include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xfparagraph.hxx>
-#include <xfilter/xftextcontent.hxx>
-#include <xfilter/xftextspan.hxx>
 #include <xfilter/xfmargins.hxx>
-#include <xfilter/xftabstop.hxx>
-#include <xfilter/xflinebreak.hxx>
 #include <xfilter/xfsection.hxx>
 #include <xfilter/xfsectionstyle.hxx>
 #include <xfilter/xfcolor.hxx>
-#include <xfilter/xfhyperlink.hxx>
 #include <xfilter/xfliststyle.hxx>
-#include "lwpcharsetmgr.hxx"
 #include "lwpfribheader.hxx"
-#include "lwpsection.hxx"
 #include "lwplayout.hxx"
-#include "lwpusewhen.hxx"
 #include "lwpbulletstylemgr.hxx"
 #include "lwpstory.hxx"
 #include "lwpsilverbullet.hxx"
-#include <xfilter/xflist.hxx>
-#include <xfilter/xfframe.hxx>
-
-#include "lwpdivinfo.hxx"
-#include "lwpdoc.hxx"
-#include "lwpholder.hxx"
-#include "lwppagehint.hxx"
 
 #include <lwpdropcapmgr.hxx>
-#include "lwptable.hxx"
 #include <memory>
 #include <o3tl/sorted_vector.hxx>
 
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index a6901bf9b57b..4a32be862b5b 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -64,43 +64,14 @@
 
 #include "lwppara.hxx"
 #include <lwpglobalmgr.hxx>
-#include <lwpfilehdr.hxx>
 #include "lwpparaproperty.hxx"
-#include <lwptools.hxx>
 #include "lwpparastyle.hxx"
-#include <xfilter/xffont.hxx>
-#include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfstylemanager.hxx>
-#include <xfilter/xfparagraph.hxx>
-#include <xfilter/xftextcontent.hxx>
-#include <xfilter/xftextspan.hxx>
-#include <xfilter/xfmargins.hxx>
-#include <xfilter/xftabstop.hxx>
-#include <xfilter/xflinebreak.hxx>
-#include <xfilter/xfsection.hxx>
-#include <xfilter/xfsectionstyle.hxx>
-#include <xfilter/xfcolor.hxx>
-#include <xfilter/xfhyperlink.hxx>
-#include "lwpcharsetmgr.hxx"
 #include "lwpfribheader.hxx"
-#include "lwpsection.hxx"
 #include "lwplayout.hxx"
-#include "lwpusewhen.hxx"
 
-#include "lwpbulletstylemgr.hxx"
 #include "lwpstory.hxx"
 #include "lwpsilverbullet.hxx"
-#include <xfilter/xflist.hxx>
-#include <xfilter/xfframe.hxx>
-
-#include "lwpdivinfo.hxx"
-#include "lwpdoc.hxx"
-#include "lwpholder.hxx"
-#include "lwppagehint.hxx"
-
-#include <lwpdropcapmgr.hxx>
-#include "lwptable.hxx"
-#include "lwpcelllayout.hxx"
 #include "lwpframelayout.hxx"
 
 #include <o3tl/sorted_vector.hxx>
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index 4e9871363914..542f124beefd 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -80,8 +80,6 @@
 #include "lwpmargins.hxx"
 #include "lwptabrack.hxx"
 
-#include "lwpsilverbullet.hxx"
-
 LwpParaStyle::LwpParaStyle(LwpObjectHeader const & objHdr, LwpSvStream* pStrm) :
 LwpTextStyle(objHdr, pStrm)
 {
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx
index 56ea0c98ce33..e21505d06420 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -64,10 +64,8 @@
 #include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xfrow.hxx>
 #include <xfilter/xfrowstyle.hxx>
-#include <xfilter/xftablestyle.hxx>
 #include <xfilter/xftable.hxx>
 #include <xfilter/xfcell.hxx>
-#include <xfilter/xfcellstyle.hxx>
 #include <o3tl/sorted_vector.hxx>
 
 LwpRowLayout::LwpRowLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
index 036f0ea7209d..5c8d9941344a 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
@@ -59,21 +59,10 @@
 #include "lwpsdwgrouploaderv0102.hxx"
 #include "lwpdrawobj.hxx"
 #include <lwptools.hxx>
-#include "lwpcharsetmgr.hxx"
 #include "lwpgrfobj.hxx"
 #include "lwpframelayout.hxx"
 
-#include <xfilter/xfcolor.hxx>
-#include <xfilter/xfdrawline.hxx>
-#include <xfilter/xfdrawpath.hxx>
-#include <xfilter/xfdrawpolyline.hxx>
-#include <xfilter/xfdrawrect.hxx>
-#include <xfilter/xfdrawpolygon.hxx>
 #include <xfilter/xfdrawgroup.hxx>
-#include <xfilter/xfdrawstyle.hxx>
-#include <xfilter/xfdrawlinestyle.hxx>
-#include <xfilter/xfparagraph.hxx>
-#include <xfilter/xfstylemanager.hxx>
 #include <sal/log.hxx>
 
 LwpSdwGroupLoaderV0102::LwpSdwGroupLoaderV0102(SvStream* pStream, LwpGraphicObject* pGraphicObj)
diff --git a/lotuswordpro/source/filter/lwpsection.cxx b/lotuswordpro/source/filter/lwpsection.cxx
index 864f7e1f5280..81d30c322435 100644
--- a/lotuswordpro/source/filter/lwpsection.cxx
+++ b/lotuswordpro/source/filter/lwpsection.cxx
@@ -60,11 +60,8 @@
 
 #include <lwpcolor.hxx>
 #include <lwpatomholder.hxx>
-#include "lwplayout.hxx"
 #include "lwpdlvlist.hxx"
-#include <lwpobj.hxx>
 #include "lwpsection.hxx"
-#include <xfilter/xfsection.hxx>
 
 LwpOrderedObject::LwpOrderedObject(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpDLNFVList(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index bc1541d6bf9b..fbfc35174dd7 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -61,13 +61,9 @@
 #include <lwpglobalmgr.hxx>
 #include "lwptablelayout.hxx"
 #include <lwpfoundry.hxx>
-#include <lwpobjfactory.hxx>
 #include "lwpholder.hxx"
 #include "lwptable.hxx"
 #include "lwptblcell.hxx"
-#include "lwpnumericfmt.hxx"
-#include "lwpdlvlist.hxx"
-#include "lwppara.hxx"
 #include "lwprowlayout.hxx"
 #include <lwpfilehdr.hxx>
 
@@ -76,12 +72,12 @@
 #include <xfilter/xfrow.hxx>
 #include <xfilter/xfrowstyle.hxx>
 #include <xfilter/xfcell.hxx>
-#include <xfilter/xfcellstyle.hxx>
 #include <xfilter/xfcolstyle.hxx>
 #include <xfilter/xfframestyle.hxx>
 #include <xfilter/xfframe.hxx>
 #include <xfilter/xffloatframe.hxx>
 #include "lwpframelayout.hxx"
+#include <xfilter/xfnumberstyle.hxx>
 #include <xfilter/xfparastyle.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <sal/log.hxx>
diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx
index 1de069757dde..c17c5ed5a3ef 100644
--- a/lotuswordpro/source/filter/lwptblcell.cxx
+++ b/lotuswordpro/source/filter/lwptblcell.cxx
@@ -59,10 +59,8 @@
  */
 
 #include <lwpfilehdr.hxx>
-#include <lwpoverride.hxx>
 #include <lwpobjid.hxx>
 #include "lwptblcell.hxx"
-#include "lwppara.hxx"
 
  LwpCellList::LwpCellList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
      : LwpDLVList(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 1a0b47822bbb..6c9f29f722af 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -58,7 +58,6 @@
  *  For LWP filter architecture prototype - table cell numerics format
  */
 
-#include <lwpoverride.hxx>
 #include "lwptblcell.hxx"
 #include "lwppara.hxx"
 #include "lwptblformula.hxx"
diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index 8888e6af9619..30de25746d6c 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -64,16 +64,12 @@
 #include "lwpframelayout.hxx"
 #include <lwpglobalmgr.hxx>
 
-#include <xfilter/xffont.hxx>
 #include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfstylemanager.hxx>
-#include <xfilter/xfparagraph.hxx>
 #include <xfilter/xfparastyle.hxx>
 #include <xfilter/xfindex.hxx>
 #include <xfilter/xffloatframe.hxx>
-#include <xfilter/xfframestyle.hxx>
 #include <xfilter/xfframe.hxx>
-#include <xfilter/xftable.hxx>
 
 LwpTocSuperLayout::LwpTocSuperLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpSuperTableLayout(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/utbenvs.cxx b/lotuswordpro/source/filter/utbenvs.cxx
index f597351aee85..e34a855e00eb 100644
--- a/lotuswordpro/source/filter/utbenvs.cxx
+++ b/lotuswordpro/source/filter/utbenvs.cxx
@@ -53,7 +53,7 @@
  *
  *
  ************************************************************************/
-#include "first.hxx"
+#include "bento.hxx"
 #include <assert.h>
 namespace OpenStormBento
 {
diff --git a/lotuswordpro/source/filter/utlist.cxx b/lotuswordpro/source/filter/utlist.cxx
index 5c0d4d261cd0..8f44cdb2f816 100644
--- a/lotuswordpro/source/filter/utlist.cxx
+++ b/lotuswordpro/source/filter/utlist.cxx
@@ -53,8 +53,7 @@
  *
  *
  ************************************************************************/
-#include "first.hxx"
-
+#include "utlist.hxx"
 namespace OpenStormBento
 {
 
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.cxx b/lotuswordpro/source/filter/xfilter/xfcolor.cxx
index 357e659fbeae..c30e35341f3e 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolor.cxx
@@ -57,7 +57,6 @@
  * @file
  * Color object to serial to xml filter.
  ************************************************************************/
-#include <string.h>
 #include <stdio.h>
 #include <xfilter/xfcolor.hxx>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.cxx b/lotuswordpro/source/filter/xfilter/xfdate.cxx
index 615f8512224c..73425802f8d5 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.cxx
@@ -57,7 +57,6 @@
  * @file
  * Date field with date style.
  ************************************************************************/
-#include <string.h>
 #include <xfilter/xfdate.hxx>
 #include <xfilter/ixfattrlist.hxx>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx
index f968303da470..62bd2caf26cd 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx
@@ -60,7 +60,7 @@
 #include <xfilter/xfglobal.hxx>
 #include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfframe.hxx>
-#include <xfilter/xfparagraph.hxx>
+
 #define     ZINDEX_MIN 0
 
 XFFrame::XFFrame()
diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.cxx b/lotuswordpro/source/filter/xfilter/xfglobal.cxx
index 43d9ca9c9ae3..29bfe08d0055 100644
--- a/lotuswordpro/source/filter/xfilter/xfglobal.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfglobal.cxx
@@ -59,8 +59,6 @@
  * It's all for the full filter.
  ************************************************************************/
 #include <xfilter/xfglobal.hxx>
-#include <xfilter/xffontfactory.hxx>
-#include <xfilter/xfstylemanager.hxx>
 
 int XFGlobal::s_nFrameID = 1;
 int XFGlobal::s_nSectionID = 1;
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index 4feb10bd96c2..902e1e970612 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -59,7 +59,6 @@
  ************************************************************************/
 #include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfindex.hxx>
-#include <xfilter/xfparagraph.hxx>
 
 XFIndex::XFIndex()
     : m_eType(enumXFIndexTOC)
diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx
index b9e71c302c14..bb683f13ede3 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.cxx
@@ -58,7 +58,6 @@
  * List object.
  ************************************************************************/
 #include <xfilter/xflist.hxx>
-#include <xfilter/xflistitem.hxx>
 #include <xfilter/ixfstream.hxx>
 #include <xfilter/ixfattrlist.hxx>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
index d92a0218a059..8cc28d305e2e 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
@@ -58,11 +58,8 @@
  * Master page object which was used to apply a layout to the pages.
  ************************************************************************/
 #include <xfilter/xfmasterpage.hxx>
-#include <xfilter/xfpagemaster.hxx>
-#include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xffooter.hxx>
 #include <xfilter/xfheader.hxx>
-#include <lwpglobalmgr.hxx>
 
 void XFMasterPage::SetHeader(rtl::Reference<XFHeader> const & rHeader)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
index 478513cbb7ac..0b600cb669a2 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
@@ -60,7 +60,6 @@
 #include <xfilter/xfparagraph.hxx>
 #include <xfilter/ixfstream.hxx>
 #include <xfilter/ixfattrlist.hxx>
-#include <xfilter/xftextcontent.hxx>
 
 XFParagraph::XFParagraph()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.cxx b/lotuswordpro/source/filter/xfilter/xfrow.cxx
index 85a12973183d..d4825f966aff 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.cxx
@@ -64,7 +64,6 @@
 #include <xfilter/ixfstream.hxx>
 #include <xfilter/xfrow.hxx>
 #include <xfilter/xfcell.hxx>
-#include <xfilter/xftable.hxx>
 
 XFRow::XFRow()
     : m_pOwnerTable(nullptr)
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
index 3a1982853bff..99d654da4871 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
@@ -58,7 +58,6 @@
  * Table row style, ie. table row height.
  ************************************************************************/
 #include <xfilter/xfrowstyle.hxx>
-#include <xfilter/xfbgimage.hxx>
 #include <xfilter/ixfattrlist.hxx>
 
 XFRowStyle::XFRowStyle():m_fHeight(0)
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
index 4f667ae3a13c..ecdf4d6e006f 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
@@ -63,9 +63,7 @@
 #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>
 
 using namespace ::cppu;
diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 47148729cb1a..07da1a57d4fc 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -58,9 +58,8 @@
  * Table object.
  ************************************************************************/
 #include <xfilter/xftable.hxx>
+#include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xfrow.hxx>
-#include <xfilter/xfcolstyle.hxx>
-#include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xfglobal.hxx>
 #include <cassert>
 
diff --git a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
index eed8df9439d9..a399f4c333d9 100644
--- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
@@ -55,10 +55,6 @@
  ************************************************************************/
 #include <xfilter/ixfattrlist.hxx>
 #include <xfilter/xftextboxstyle.hxx>
-#include <xfilter/xfcolumns.hxx>
-#include <xfilter/xfborders.hxx>
-#include <xfilter/xfshadow.hxx>
-#include <xfilter/xfbgimage.hxx>
 
 XFTextBoxStyle::XFTextBoxStyle()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
index 85b79a980b19..50eda9fcf761 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
@@ -62,7 +62,6 @@
 #include <xfilter/ixfattrlist.hxx>
 #include <xfilter/ixfstream.hxx>
 #include <xfilter/xffont.hxx>
-#include <xfilter/xfutil.hxx>
 
 XFTextStyle::XFTextStyle()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index bb21be1f04d6..fe2e37b78468 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -58,10 +58,6 @@
  * Util functions for xml filter.
  ************************************************************************/
 #include <xfilter/xfutil.hxx>
-#include <xfilter/xfparagraph.hxx>
-#include <xfilter/xfcontentcontainer.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <sstream>
 
 OUString   GetTableColName(sal_Int32 col)
 {