tdf#42949 Fix IWYU warnings in lotuswordpro/source/filter/*hxx

Also drop the now unused pass-through header lotuswordpro/inc/lwpheader.hxx

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

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

76 files changed, 147 insertions, 185 deletions

diff --git a/lotuswordpro/IwyuFilter_lotuswordpro.yaml b/lotuswordpro/IwyuFilter_lotuswordpro.yaml
index 1576e1dbf7ec..fc8feffb209c 100644
--- a/lotuswordpro/IwyuFilter_lotuswordpro.yaml
+++ b/lotuswordpro/IwyuFilter_lotuswordpro.yaml
@@ -1,18 +1,6 @@
 ---
 assumeFilename: lotuswordpro/source/filter/lwplayout.cxx
 blacklist:
-    lotuswordpro/inc/lwpheader.hxx:
-    # pass-through header; keep it for now
-    - config_lgpl.h
-    - math.h
-    - memory
-    - map
-    - vector
-    - assert.h
-    - string
-    - sal/types.h
-    - rtl/ustring.hxx
-    - memory.h
     lotuswordpro/inc/lwpatomholder.hxx:
     # Needed for MPL subset
     - config_lgpl.h
@@ -67,3 +55,60 @@ blacklist:
     lotuswordpro/inc/lwptools.hxx:
     # Needed for MPL subset
     - config_lgpl.h
+    lotuswordpro/source/filter/lwp9reader.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpbulletstylemgr.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpcontent.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpdivinfo.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpdivopts.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpdoc.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwplayout.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpgrfobj.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwppara.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwprowlayout.hxx:
+    # Complete type is needed for dynamic_cast
+    - lwptablelayout.hxx
+    lotuswordpro/source/filter/lwpsdwdrawheader.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpsdwfileloader.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpsdwrect.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpsortopt.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpsilverbullet.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpuidoc.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpusewhen.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
+    lotuswordpro/source/filter/lwpusrdicts.hxx:
+    # Needed for MPL subset
+    - config_lgpl.h
diff --git a/lotuswordpro/inc/lwpheader.hxx b/lotuswordpro/inc/lwpheader.hxx
deleted file mode 100644
index ea96137e383a..000000000000
--- a/lotuswordpro/inc/lwpheader.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: IBM Corporation
- *
- *  Copyright: 2008 by IBM Corporation
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*
- * @file
- *  For LWP filter architecture prototype
- */
-
-#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPHEADER_HXX
-#define INCLUDED_LOTUSWORDPRO_INC_LWPHEADER_HXX
-
-#include <config_lgpl.h>
-#include <math.h>
-#include <memory>
-#include <map>
-#include <vector>
-#include <assert.h>
-#include <string>
-
-#include <sal/types.h>
-#include <sal/config.h>
-
-#include <rtl/ustring.hxx>
-#include <memory.h>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index 50129e94d76b..e0843e04011e 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -20,14 +20,13 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LOTUSWORDPROIMPORTFILTER_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LOTUSWORDPROIMPORTFILTER_HXX
 
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <rtl/ustrbuf.hxx>
 
 /* This component will be instantiated for both import or export. Whether it calls
  * setSourceDocument or setTargetDocument determines which Impl function the filter
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index bef463deb767..3f85996722ee 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -54,6 +54,7 @@
  *
  ************************************************************************/
 #include "first.hxx"
+#include "tocread.hxx"
 #include <assert.h>
 #include <stdio.h>
 #include <osl/diagnose.h>
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index b15cb6bc371f..68850985b988 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -60,7 +60,6 @@
 
 #include <cstring>
 #include <memory>
-#include <string>
 #include <vector>
 #include <lwpsvstream.hxx>
 
@@ -71,10 +70,9 @@
 #define BEN_EXPORT
 #endif
 
-#include "ut.hxx"
 #include "utlist.hxx"
 #include <tools/stream.hxx>
-#include <sot/storage.hxx>
+#include <tools/solar.h>
 
 namespace OpenStormBento
 {
diff --git a/lotuswordpro/source/filter/first.hxx b/lotuswordpro/source/filter/first.hxx
index 3b412b52e05a..4a4f8fa67a70 100644
--- a/lotuswordpro/source/filter/first.hxx
+++ b/lotuswordpro/source/filter/first.hxx
@@ -71,9 +71,6 @@ CBenIDListElmt * FindID(CUtList * pList, BenObjectID ObjectID,
   CUtListElmt ** ppPrev);
 } // end namespace
 
-// Private headers
-#include "bentoid.hxx"
-#include "tocread.hxx"
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwp9reader.hxx b/lotuswordpro/source/filter/lwp9reader.hxx
index b3bb40c968e3..bbbc551f8675 100644
--- a/lotuswordpro/source/filter/lwp9reader.hxx
+++ b/lotuswordpro/source/filter/lwp9reader.hxx
@@ -56,7 +56,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWP9READER_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWP9READER_HXX
 
-#include <lwpheader.hxx>
+#include <config_lgpl.h>
 #include <lwpsvstream.hxx>
 #include <lwpfilehdr.hxx>
 #include <lwpobjfactory.hxx>
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index c2cb1af53d8e..ec3335766a19 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -59,6 +59,7 @@
  ************************************************************************/
 
 #include "lwpbulletstylemgr.hxx"
+#include "lwpfribheader.hxx"
 #include "lwpdoc.hxx"
 #include "lwpstory.hxx"
 #include "lwpdivinfo.hxx"
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index c566e60caacb..7a7e0a57c5f3 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -63,10 +63,9 @@
 
 #include <memory>
 
-#include <lwpheader.hxx>
+#include <config_lgpl.h>
 #include <lwpfoundry.hxx>
 #include <lwpobjid.hxx>
-#include "lwpnumberingoverride.hxx"
 #include <utility>
 #include <xfilter/xfcontentcontainer.hxx>
 
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 13b6461feeb5..ddf04483817c 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -67,6 +67,8 @@
 #include "lwpholder.hxx"
 #include "lwpnumericfmt.hxx"
 #include "lwptable.hxx"
+#include "lwprowlayout.hxx"
+#include <lwpfilehdr.hxx>
 #include <lwpglobalmgr.hxx>
 
 #include <xfilter/xfstylemanager.hxx>
diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx
index c558548fec91..e6a3130702b3 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.hxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.hxx
@@ -60,10 +60,9 @@
 
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCELLLAYOUT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCELLLAYOUT_HXX
-#include <vector>
-#include <map>
+
 #include "lwplayout.hxx"
-#include "lwptablelayout.hxx"
+#include <xfilter/xfcell.hxx>
 
 typedef enum
 {
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.hxx b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
index 0b0a84ffea19..53cb0ae20d5c 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.hxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
@@ -61,7 +61,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARACTERSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARACTERSTYLE_HXX
 
-#include <lwpobj.hxx>
 #include "lwpdlvlist.hxx"
 #include <lwpoverride.hxx>
 #include "lwpcharborderoverride.hxx"
diff --git a/lotuswordpro/source/filter/lwpcharsetmgr.hxx b/lotuswordpro/source/filter/lwpcharsetmgr.hxx
index 0443540a5357..c48e37c6a0ac 100644
--- a/lotuswordpro/source/filter/lwpcharsetmgr.hxx
+++ b/lotuswordpro/source/filter/lwpcharsetmgr.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARSETMGR_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARSETMGR_HXX
 
-#include <lwpfilehdr.hxx>
+#include <rtl/textenc.h>
 #include <map>
 
 class LwpCharSetMgr
diff --git a/lotuswordpro/source/filter/lwpcontent.hxx b/lotuswordpro/source/filter/lwpcontent.hxx
index 6bee0d1af19d..7fc976d98505 100644
--- a/lotuswordpro/source/filter/lwpcontent.hxx
+++ b/lotuswordpro/source/filter/lwpcontent.hxx
@@ -61,11 +61,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCONTENT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCONTENT_HXX
 
-#include <lwpheader.hxx>
+#include <config_lgpl.h>
 #include <lwpobj.hxx>
 #include <lwpatomholder.hxx>
 #include "lwplayout.hxx"
-#include "lwphyperlinkmgr.hxx"
+
 /**
  * @brief
  * Base class of all Lwp content objects
diff --git a/lotuswordpro/source/filter/lwpdivinfo.cxx b/lotuswordpro/source/filter/lwpdivinfo.cxx
index ea58b2d9c516..6418694019b9 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.cxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.cxx
@@ -59,6 +59,7 @@
  ************************************************************************/
 
 #include "lwpdivinfo.hxx"
+#include "lwpdoc.hxx"
 #include <lwpobjstrm.hxx>
 #include <lwpfilehdr.hxx>
 #include "lwpholder.hxx"
diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx
index c04271799d64..e1fea74c0797 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.hxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.hxx
@@ -61,12 +61,12 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVINFO_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVINFO_HXX
 
+#include <config_lgpl.h>
+
 #include <lwpobj.hxx>
 #include <lwpobjid.hxx>
 #include <lwpatomholder.hxx>
 #include <lwpcolor.hxx>
-#include <lwpheader.hxx>
-#include "lwpdoc.hxx"
 
 #define STR_OleDivisionClassName    "OLEDivision"
 
diff --git a/lotuswordpro/source/filter/lwpdivopts.hxx b/lotuswordpro/source/filter/lwpdivopts.hxx
index 33a26f2ce50e..1d271f8d7d6c 100644
--- a/lotuswordpro/source/filter/lwpdivopts.hxx
+++ b/lotuswordpro/source/filter/lwpdivopts.hxx
@@ -61,11 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVOPTS_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVOPTS_HXX
 
+#include <config_lgpl.h>
+
 #include <lwpobj.hxx>
-#include <lwpobjid.hxx>
-#include <lwpatomholder.hxx>
-#include <lwpcolor.hxx>
-#include <lwpheader.hxx>
 
 class LwpHyphenOptions
 {
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index f42a510fef5e..f59c41827b22 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -63,8 +63,12 @@
 #include "lwpstory.hxx"
 #include "lwppara.hxx"
 #include "lwpsilverbullet.hxx"
+#include "lwpsortopt.hxx"
 #include "lwplayout.hxx"
 #include "lwppagelayout.hxx"
+#include "lwpuidoc.hxx"
+#include "lwpusrdicts.hxx"
+#include "lwpprtinfo.hxx"
 #include "lwpverdocument.hxx"
 #include <xfilter/xftextstyle.hxx>
 #include <xfilter/xfstylemanager.hxx>
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx
index b6385518dee4..3e9b101dbc0a 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -61,14 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDOC_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDOC_HXX
 
-#include <lwpobj.hxx>
-#include "lwpsortopt.hxx"
-#include "lwpuidoc.hxx"
+#include <config_lgpl.h>
 #include "lwplnopts.hxx"
-#include "lwpusrdicts.hxx"
-#include "lwpprtinfo.hxx"
 #include "lwpdlvlist.hxx"
-#include <lwpheader.hxx>
 #include <lwpfoundry.hxx>
 
 class IXFStream;
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index a44ad489f780..c98daf8629cd 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -65,9 +65,12 @@
 #include <sal/config.h>
 
 #include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
 
 #include "lwpsdwdrawheader.hxx"
 
+#include <memory>
+
 class SvStream;
 class XFFrame;
 class XFDrawStyle;
diff --git a/lotuswordpro/source/filter/lwpfnlayout.hxx b/lotuswordpro/source/filter/lwpfnlayout.hxx
index 24c0920caf8a..0cdd9d1cc1ff 100644
--- a/lotuswordpro/source/filter/lwpfnlayout.hxx
+++ b/lotuswordpro/source/filter/lwpfnlayout.hxx
@@ -62,6 +62,7 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFNLAYOUT_HXX
 
 #include "lwptablelayout.hxx"
+#include "lwprowlayout.hxx"
 
 /**
  * @brief   VO_FOOTNOTELAYOUT object
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index 570366f3793d..dc873d16774e 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -59,6 +59,7 @@
  ************************************************************************/
 
 #include <memory>
+#include <lwpfilehdr.hxx>
 #include "lwpframelayout.hxx"
 #include "lwppara.hxx"
 #include <xfilter/xfstylemanager.hxx>
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx
index a243de61643c..af07c5c22ee0 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -65,6 +65,9 @@
 #include "lwplayout.hxx"
 #include "lwpstory.hxx"
 #include "lwpmarker.hxx"
+#include <xfilter/xfframestyle.hxx>
+#include <xfilter/xfframe.hxx>
+
 /**
  * @brief       For register frame style and parse frame
  *
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.cxx b/lotuswordpro/source/filter/lwpfribbreaks.cxx
index 9d024ccff383..cf9801275556 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.cxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.cxx
@@ -59,6 +59,7 @@
  ************************************************************************/
 
 #include "lwpfribbreaks.hxx"
+#include "lwpfribheader.hxx"
 #include "lwpstory.hxx"
 #include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xfsectionstyle.hxx>
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.hxx b/lotuswordpro/source/filter/lwpfribbreaks.hxx
index 24a93b6c6fc1..e54ffbf6a29d 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.hxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.hxx
@@ -62,7 +62,6 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBBREAKS_HXX
 
 #include <lwpfrib.hxx>
-#include <xfilter/xfparastyle.hxx>
 #include "lwppara.hxx"
 #include "lwpfribsection.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpfribframe.hxx b/lotuswordpro/source/filter/lwpfribframe.hxx
index 74dce5cf2f5e..e1834644a4d4 100644
--- a/lotuswordpro/source/filter/lwpfribframe.hxx
+++ b/lotuswordpro/source/filter/lwpfribframe.hxx
@@ -62,7 +62,6 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBFRAME_HXX
 
 #include <lwpfrib.hxx>
-#include "lwplayout.hxx"
 #include "lwppara.hxx"
 #include "lwpframelayout.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx
index 50b0bb501a91..0f47b204a02f 100644
--- a/lotuswordpro/source/filter/lwpfribmark.hxx
+++ b/lotuswordpro/source/filter/lwpfribmark.hxx
@@ -64,7 +64,6 @@
 #include <lwpfrib.hxx>
 #include "lwpstory.hxx"
 #include "lwpmarker.hxx"
-#include <xfilter/xftextspan.hxx>
 #include <xfilter/xfbookmark.hxx>
 
 class LwpFribCHBlock : public LwpFrib
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx
index 988d338e9613..49e8d514b295 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -62,10 +62,9 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPGRFOBJ_HXX
 
 #include <sal/types.h>
+#include <config_lgpl.h>
 
 #include "lwpoleobject.hxx"
-#include <lwpheader.hxx>
-#include <xfilter/xfrect.hxx>
 
 struct ImageProcessingData
 {
diff --git a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
index 71dc7a0f8037..5eab1cc920e4 100644
--- a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
+++ b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHYPERLINKMGR_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHYPERLINKMGR_HXX
 
-#include <lwpfilehdr.hxx>
+#include <rtl/ustring.hxx>
 
 class LwpHyperlinkMgr
 {
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 4c41574180a2..dcb49f11c13e 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -71,6 +71,7 @@
 #include "lwppagehint.hxx"
 #include "lwpdivinfo.hxx"
 #include "lwpgrfobj.hxx"
+#include <lwpfilehdr.hxx>
 #include <osl/thread.h>
 #include <sal/log.hxx>
 #include <o3tl/sorted_vector.hxx>
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index c11f830c83a5..9ac89fddc60c 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -63,16 +63,15 @@
 
 #include <memory>
 #include <sal/config.h>
+#include <config_lgpl.h>
 
 #include <rtl/ref.hxx>
 
-#include <lwpheader.hxx>
 #include <lwpobj.hxx>
 #include <lwpobjhdr.hxx>
 #include <lwpobjstrm.hxx>
 #include <lwpobjid.hxx>
 #include "lwpdlvlist.hxx"
-#include <lwpfilehdr.hxx>
 
 #include "lwplayoutdef.hxx"
 #include <xfilter/xfdefs.hxx>
@@ -80,8 +79,6 @@
 #include <xfilter/xfpagemaster.hxx>
 #include <xfilter/xfcolumns.hxx>
 #include <xfilter/xfborders.hxx>
-#include <xfilter/xfframestyle.hxx>
-#include <xfilter/xfframe.hxx>
 #include <xfilter/xfbgimage.hxx>
 #include "lwpusewhen.hxx"
 #include "lwplaypiece.hxx"
diff --git a/lotuswordpro/source/filter/lwplnopts.hxx b/lotuswordpro/source/filter/lwplnopts.hxx
index afa8bca39d21..a861b311ba64 100644
--- a/lotuswordpro/source/filter/lwplnopts.hxx
+++ b/lotuswordpro/source/filter/lwplnopts.hxx
@@ -62,9 +62,6 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLNOPTS_HXX
 
 #include <lwpobjstrm.hxx>
-#include <lwptools.hxx>
-#include <xfilter/xflinenumberconfig.hxx>
-#include <xfilter/xfstylemanager.hxx>
 
 /**
  * @brief   line number options
diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx
index 719b07ea4c50..2a94aaaa2f76 100644
--- a/lotuswordpro/source/filter/lwpmarker.hxx
+++ b/lotuswordpro/source/filter/lwpmarker.hxx
@@ -61,11 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPMARKER_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPMARKER_HXX
 
-#include <lwpobj.hxx>
 #include <lwpobjid.hxx>
 #include "lwpdlvlist.hxx"
 #include <lwpfrib.hxx>
-#include <xfilter/xftextspan.hxx>
 
 class LwpMarker : public LwpDLNFPVList
 {
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx
index 1826482edac0..3edf96eeb8dc 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.cxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx
@@ -59,6 +59,7 @@
  */
 
 #include <memory>
+#include <lwpfilehdr.hxx>
 #include "lwpnumericfmt.hxx"
 
 LwpCurrencyPool  LwpNumericFormat::m_aCurrencyInfo;
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index 783ac8a71d46..225f373c4f6f 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -61,8 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNUMERICFMT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNUMERICFMT_HXX
 
+#include <map>
+
 #include <lwpatomholder.hxx>
-#include "lwptblcell.hxx"
 #include <lwpcolor.hxx>
 #include "lwppiece.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index 412d8919da77..2b0b056e4675 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -95,6 +95,7 @@
 #include "lwpnotes.hxx"
 #include "lwpverdocument.hxx"
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 //LwpObjectFactory* LwpObjectFactory::m_pMgr = NULL;
 
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index 34dc0fc59e48..177bf3ef1eed 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -61,15 +61,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOLEOBJECT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOLEOBJECT_HXX
 
-#include <lwpobj.hxx>
+#include "lwpcontent.hxx"
 #include <lwpobjhdr.hxx>
 #include <lwpobjid.hxx>
-#include "lwpstory.hxx"
 #include <tools/gen.hxx>
-#include <svx/svdoole2.hxx>
-#include <svx/svdpage.hxx>
-#include <sfx2/objsh.hxx>
-#include <sot/storinfo.hxx>
 
 typedef struct tagAFID_CACHE
 {
diff --git a/lotuswordpro/source/filter/lwppagehint.hxx b/lotuswordpro/source/filter/lwppagehint.hxx
index c4133b49159d..b6119f8582e4 100644
--- a/lotuswordpro/source/filter/lwppagehint.hxx
+++ b/lotuswordpro/source/filter/lwppagehint.hxx
@@ -61,7 +61,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPAGEHINT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPAGEHINT_HXX
 
-#include <lwpobj.hxx>
 #include <lwpobjid.hxx>
 #include <lwpatomholder.hxx>
 #include "lwpdlvlist.hxx"
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index 8210582dc52a..d154be4ae38d 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -73,6 +73,7 @@
 #include <xfilter/xffooter.hxx>
 #include <sfx2/printer.hxx>
 #include <lwpchangemgr.hxx>
+#include <lwpfilehdr.hxx>
 #include <lwpglobalmgr.hxx>
 #include <sal/log.hxx>
 
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index ff17248ac03e..6dfe95bb1b28 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -79,6 +79,7 @@
 #include <xfilter/xfhyperlink.hxx>
 #include <xfilter/xfliststyle.hxx>
 #include "lwpcharsetmgr.hxx"
+#include "lwpfribheader.hxx"
 #include "lwpsection.hxx"
 #include "lwplayout.hxx"
 #include "lwpusewhen.hxx"
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index 00139692f992..4815d1661a9b 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -62,23 +62,19 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARA_HXX
 
 #include <memory>
+#include <config_lgpl.h>
 
-#include "lwpfribheader.hxx"
 #include <lwpobj.hxx>
 #include <lwpobjstrm.hxx>
 
 #include <vector>
-#include <lwpheader.hxx>
 #include "lwpdlvlist.hxx"
 #include <lwpbasetype.hxx>
 #include <lwpoverride.hxx>
 #include <lwpfoundry.hxx>
 #include "lwplayout.hxx"
-#include <lwpfrib.hxx>
 #include "lwpfribptr.hxx"
 #include "lwpfribtext.hxx"
-#include <xfilter/xfparagraph.hxx>
-#include <xfilter/xfdefs.hxx>
 #include <xfilter/xfparastyle.hxx>
 #include <xfilter/xfsection.hxx>
 
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index 4ae2320c9ab6..a6901bf9b57b 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -82,6 +82,7 @@
 #include <xfilter/xfcolor.hxx>
 #include <xfilter/xfhyperlink.hxx>
 #include "lwpcharsetmgr.hxx"
+#include "lwpfribheader.hxx"
 #include "lwpsection.hxx"
 #include "lwplayout.hxx"
 #include "lwpusewhen.hxx"
diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx
index 4b4f6fca6ec6..e4c10062d5db 100644
--- a/lotuswordpro/source/filter/lwpparaproperty.hxx
+++ b/lotuswordpro/source/filter/lwpparaproperty.hxx
@@ -62,11 +62,14 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARAPROPERTY_HXX
 
 #include <memory>
-#include <lwpobj.hxx>
 #include <lwpobjstrm.hxx>
 
 #include <lwpoverride.hxx>
-#include "lwppiece.hxx"
+#include "lwpbackgroundoverride.hxx"
+#include "lwpbreaksoverride.hxx"
+#include "lwpnumberingoverride.hxx"
+#include "lwpparaborderoverride.hxx"
+#include "lwptaboverride.hxx"
 
 /* paragraph property ID's */
 #define PP_OUTLINE_SHOW         0x53484f4cUL    /* "SHOW" */
diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx
index 7c46c4238ce0..28f3eea032c5 100644
--- a/lotuswordpro/source/filter/lwpparastyle.hxx
+++ b/lotuswordpro/source/filter/lwpparastyle.hxx
@@ -62,7 +62,6 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARASTYLE_HXX
 
 #include "lwpcharacterstyle.hxx"
-#include "lwppiece.hxx"
 #include "lwpborderstuff.hxx"
 #include "lwppara.hxx"
 
diff --git a/lotuswordpro/source/filter/lwppiece.hxx b/lotuswordpro/source/filter/lwppiece.hxx
index 5bfbae7e64bd..707c4e542999 100644
--- a/lotuswordpro/source/filter/lwppiece.hxx
+++ b/lotuswordpro/source/filter/lwppiece.hxx
@@ -61,9 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPIECE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPIECE_HXX
 
-#include <lwpobj.hxx>
 #include <lwpoverride.hxx>
-#include <lwpobjstrm.hxx>
 #include "lwpdlvlist.hxx"
 #include "lwpbreaksoverride.hxx"
 #include "lwpparaborderoverride.hxx"
diff --git a/lotuswordpro/source/filter/lwpproplist.hxx b/lotuswordpro/source/filter/lwpproplist.hxx
index df1902c482c0..f9f9e4ee14f3 100644
--- a/lotuswordpro/source/filter/lwpproplist.hxx
+++ b/lotuswordpro/source/filter/lwpproplist.hxx
@@ -61,7 +61,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPROPLIST_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPROPLIST_HXX
 
-#include <lwpobj.hxx>
 #include "lwpdlvlist.hxx"
 #include <lwpatomholder.hxx>
 
diff --git a/lotuswordpro/source/filter/lwpprtinfo.cxx b/lotuswordpro/source/filter/lwpprtinfo.cxx
index bd793aab1b00..57426569035b 100644
--- a/lotuswordpro/source/filter/lwpprtinfo.cxx
+++ b/lotuswordpro/source/filter/lwpprtinfo.cxx
@@ -54,6 +54,7 @@
  *
  ************************************************************************/
 #include "lwpprtinfo.hxx"
+#include <lwpatomholder.hxx>
 
 LwpPrinterInfo::LwpPrinterInfo(LwpObjectStream* pStrm)
 {
diff --git a/lotuswordpro/source/filter/lwpprtinfo.hxx b/lotuswordpro/source/filter/lwpprtinfo.hxx
index 43bcad605fde..95b4df109d03 100644
--- a/lotuswordpro/source/filter/lwpprtinfo.hxx
+++ b/lotuswordpro/source/filter/lwpprtinfo.hxx
@@ -61,7 +61,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPRTINFO_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPRTINFO_HXX
 
-#include <lwpatomholder.hxx>
 #include <lwpobjstrm.hxx>
 /**
  * @brief   printer info used in VO_DOCUMENT
diff --git a/lotuswordpro/source/filter/lwppttntbl.hxx b/lotuswordpro/source/filter/lwppttntbl.hxx
index b196e8c2af0f..a0774fbbb8bf 100644
--- a/lotuswordpro/source/filter/lwppttntbl.hxx
+++ b/lotuswordpro/source/filter/lwppttntbl.hxx
@@ -62,6 +62,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPTTNTBL_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPTTNTBL_HXX
 
+#include <sal/types.h>
+
 static const sal_uInt8 s_pLwpPatternTab[][8] = {                //Id  Name
     { 0xDF, 0xAF, 0x77, 0x77, 0x77, 0x77, 0xFA, 0xFD },//0  Transparent
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },//1  SolidForeground
diff --git a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
index 36ab257c256e..3153b837aaba 100644
--- a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
+++ b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
@@ -62,8 +62,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWDRAWHEADER_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWDRAWHEADER_HXX
 
-#include <lwpheader.hxx>
-#include <lwptools.hxx>
+#include <config_lgpl.h>
+#include <sal/types.h>
 
 const sal_uInt8 DRAW_FACESIZE = 32;
 const double THRESHOLD = 0.0001;
diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.hxx b/lotuswordpro/source/filter/lwpsdwfileloader.hxx
index 81ca55072ea3..8801394870b6 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.hxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.hxx
@@ -58,14 +58,12 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWFILELOADER_HXX
 
 #include <sal/config.h>
+#include <config_lgpl.h>
 
 #include <vector>
 
 #include <rtl/ref.hxx>
 
-#include <lwpheader.hxx>
-#include <xfilter/ixfstream.hxx>
-
 class SvStream;
 class XFFrame;
 class LwpGraphicObject;
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
index b941826d0ec9..6bcf4892a002 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
@@ -58,10 +58,10 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWGROUPLOADERV0102_HXX
 
 #include <sal/config.h>
+#include <config_lgpl.h>
 
 #include <rtl/ref.hxx>
 
-#include <lwpheader.hxx>
 #include "lwpsdwdrawheader.hxx"
 
 class SvStream;
diff --git a/lotuswordpro/source/filter/lwpsdwrect.cxx b/lotuswordpro/source/filter/lwpsdwrect.cxx
index f06f68d6c71d..353d8dd38544 100644
--- a/lotuswordpro/source/filter/lwpsdwrect.cxx
+++ b/lotuswordpro/source/filter/lwpsdwrect.cxx
@@ -60,6 +60,7 @@
  */
 
 #include "lwpsdwrect.hxx"
+#include <cmath>
 
 /**************************************************************************
  * @short:  Default constructor
diff --git a/lotuswordpro/source/filter/lwpsdwrect.hxx b/lotuswordpro/source/filter/lwpsdwrect.hxx
index 19fac58a2c99..4aefb6a09f88 100644
--- a/lotuswordpro/source/filter/lwpsdwrect.hxx
+++ b/lotuswordpro/source/filter/lwpsdwrect.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWRECT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWRECT_HXX
 
-#include <lwpheader.hxx>
+#include <config_lgpl.h>
 #include <tools/gen.hxx>
 #include <array>
 
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 7370d7f5d0f4..d13371158c2c 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -63,6 +63,7 @@
 #include "lwpsilverbullet.hxx"
 #include "lwpdoc.hxx"
 #include "lwpdivinfo.hxx"
+#include "lwpfribheader.hxx"
 #include <lwpfoundry.hxx>
 #include "lwpstory.hxx"
 #include "lwppara.hxx"
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx
index 5bf34b396254..2b56805bf5ba 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.hxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx
@@ -61,13 +61,12 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSILVERBULLET_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSILVERBULLET_HXX
 
+#include <config_lgpl.h>
 #include <memory>
-#include <lwpheader.hxx>
-#include <lwpobj.hxx>
 #include "lwpdlvlist.hxx"
 #include <lwpobjid.hxx>
 #include <lwpatomholder.hxx>
-#include <unicode/utypes.h>
+
 const sal_uInt16 MAXNUMBERPOSITIONS = 10; //max number of positions
 const sal_uInt16 NUMCHAR_none = 0x00;   //none of numberchar
 const sal_uInt16 NUMCHAR_1 = 0x01;      //index for numberchar "1"
diff --git a/lotuswordpro/source/filter/lwpsortopt.hxx b/lotuswordpro/source/filter/lwpsortopt.hxx
index 81da561a8a34..4c0b94aa1c38 100644
--- a/lotuswordpro/source/filter/lwpsortopt.hxx
+++ b/lotuswordpro/source/filter/lwpsortopt.hxx
@@ -61,7 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSORTOPT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSORTOPT_HXX
 
-#include <lwpheader.hxx>
+#include <config_lgpl.h>
+
 #include <lwpobjstrm.hxx>
 
 /**
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index 2257b88fffa5..3c86e4857298 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -65,6 +65,7 @@
 
 #include <memory>
 #include "lwpcontent.hxx"
+#include "lwphyperlinkmgr.hxx"
 
 class LwpPageLayout;
 class LwpStory final : public LwpContent
diff --git a/lotuswordpro/source/filter/lwptable.cxx b/lotuswordpro/source/filter/lwptable.cxx
index ae29a8f4563e..143b99ca5ce0 100644
--- a/lotuswordpro/source/filter/lwptable.cxx
+++ b/lotuswordpro/source/filter/lwptable.cxx
@@ -62,6 +62,7 @@
 
 #include <algorithm>
 
+#include <lwpfilehdr.hxx>
  #include "lwptable.hxx"
 
  LwpSuperTable::LwpSuperTable(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpContent(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index 2f40600fe556..b55d7a4b4436 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -61,12 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABLE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABLE_HXX
 
-#include <lwpobj.hxx>
 #include <lwpobjhdr.hxx>
 #include <lwpobjid.hxx>
-#include "lwpstory.hxx"
 #include "lwppara.hxx"
-#include "lwppagehint.hxx"
 #include <lwptools.hxx>
 #include "lwptablelayout.hxx"
 
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index c97fb250dc6a..bc1541d6bf9b 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -68,6 +68,8 @@
 #include "lwpnumericfmt.hxx"
 #include "lwpdlvlist.hxx"
 #include "lwppara.hxx"
+#include "lwprowlayout.hxx"
+#include <lwpfilehdr.hxx>
 
 #include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xftablestyle.hxx>
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index af6a92945b57..7852ab9c0b0b 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -277,7 +277,6 @@ protected:
 };
 
 #include "lwpcelllayout.hxx"
-#include "lwprowlayout.hxx"
 
 #endif
 
diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx
index 7f13c6a0252b..1de069757dde 100644
--- a/lotuswordpro/source/filter/lwptblcell.cxx
+++ b/lotuswordpro/source/filter/lwptblcell.cxx
@@ -58,6 +58,7 @@
  *  For LWP filter architecture prototype - table cell numerics format
  */
 
+#include <lwpfilehdr.hxx>
 #include <lwpoverride.hxx>
 #include <lwpobjid.hxx>
 #include "lwptblcell.hxx"
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx
index 7505b7cf549b..e9def931b933 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -62,8 +62,7 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLCELL_HXX
 
 #include <lwpobj.hxx>
-#include <lwpatomholder.hxx>
-#include "lwpstory.hxx"
+#include "lwpdlvlist.hxx"
 
 #include <xfilter/xfcell.hxx>
 
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index 458b6513105b..ee90e1944079 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -61,6 +61,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLFORMULA_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLFORMULA_HXX
 
+#include <rtl/ustring.hxx>
+#include <memory>
+#include <vector>
+#include "lwptblcell.hxx"
+
 /* These token types are written to the file.  Don't change their
 values unless you filter them.
 */
diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx
index 933e32a13a9a..21fee29bacb4 100644
--- a/lotuswordpro/source/filter/lwpuidoc.hxx
+++ b/lotuswordpro/source/filter/lwpuidoc.hxx
@@ -61,8 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUIDOC_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUIDOC_HXX
 
-#include <lwpheader.hxx>
-#include <lwpdefs.hxx>
+#include <config_lgpl.h>
 
 class LwpNamedProperties;
 class LwpAutoRunMacroOptions;
diff --git a/lotuswordpro/source/filter/lwpusewhen.hxx b/lotuswordpro/source/filter/lwpusewhen.hxx
index 8cfc3128260b..21b5ce7f0aba 100644
--- a/lotuswordpro/source/filter/lwpusewhen.hxx
+++ b/lotuswordpro/source/filter/lwpusewhen.hxx
@@ -61,7 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSEWHEN_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSEWHEN_HXX
 
-#include <lwpheader.hxx>
+#include <config_lgpl.h>
+#include <lwpobjstrm.hxx>
 
 #define STYLE_USEONALLPAGES     0x0001U /* repeat on all pages */
 #define STYLE_USEONALLEVENPAGES 0x0002U /* repeat on all even pages */
diff --git a/lotuswordpro/source/filter/lwpusrdicts.hxx b/lotuswordpro/source/filter/lwpusrdicts.hxx
index d52d642c6b43..49ac08d6947f 100644
--- a/lotuswordpro/source/filter/lwpusrdicts.hxx
+++ b/lotuswordpro/source/filter/lwpusrdicts.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSRDICTS_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSRDICTS_HXX
 
-#include <lwpheader.hxx>
+#include <config_lgpl.h>
 #include <lwpobjstrm.hxx>
 /**
  * @brief   User defined words used in VO_DOCUMENT
diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index 203fe79a466f..18a062d1bb1e 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -60,6 +60,9 @@
 #include <cstring>
 
 #include "first.hxx"
+#include "bentoid.hxx"
+#include "tocread.hxx"
+#include "ut.hxx"
 #include <assert.h>
 namespace OpenStormBento
 {
diff --git a/lotuswordpro/source/filter/tocread.hxx b/lotuswordpro/source/filter/tocread.hxx
index 889862cf7636..b2645b0af4dd 100644
--- a/lotuswordpro/source/filter/tocread.hxx
+++ b/lotuswordpro/source/filter/tocread.hxx
@@ -55,6 +55,10 @@
  ************************************************************************/
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_TOCREAD_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_TOCREAD_HXX
+
+#include "bento.hxx"
+#include <memory>
+
 namespace OpenStormBento
 {
 
diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx
index 9913e3359fd8..3528fcacba47 100644
--- a/lotuswordpro/source/filter/utlist.hxx
+++ b/lotuswordpro/source/filter/utlist.hxx
@@ -56,8 +56,6 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_UTLIST_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_UTLIST_HXX
 
-#include "ut.hxx"
-
 namespace OpenStormBento
 {
 
diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.hxx b/lotuswordpro/source/filter/xfilter/xfbase64.hxx
index f8bcb5157f40..58f790a30b29 100644
--- a/lotuswordpro/source/filter/xfilter/xfbase64.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbase64.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBASE64_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBASE64_HXX
 
-#include <xfilter/xfglobal.hxx>
+#include <rtl/ustring.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
index 39b5c891347a..1554fdaf7cd2 100644
--- a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
@@ -61,7 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX
 
-#include <xfilter/xfstyle.hxx>
+#include <sal/types.h>
+#include <xfilter/xfdefs.hxx>
 
 class XFFontWorkStyle
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx b/lotuswordpro/source/filter/xfilter/xfimage.cxx
index cf0100014a25..33f483c7c5f5 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/xfglobal.hxx>
 #include <xfilter/ixfattrlist.hxx>
 #include "xfbase64.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
index f3c59bfbe1be..74db79e9b669 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
@@ -63,7 +63,6 @@
 #include <xfilter/ixfattrlist.hxx>
 #include <rtl/ref.hxx>
 #include <xmloff/attrlist.hxx>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
 class   XFSaxAttrList : public IXFAttrList
 {
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
index 138e84ddca79..4b455268e083 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
@@ -60,9 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABSTYLE_HXX
 
-#include <xfilter/xfglobal.hxx>
 #include <xfilter/xfstyle.hxx>
-#include <vector>
 
 class XFTabStyle : public XFStyle
 {