Move lotuswordpro include files to common include directory

...that are included from both lotuswordpro/source/filter and lotuswordpro/source/filter/xfilter. Change done in preparation of loplugin:includeform. Change-Id: I7b65d3232e164af662b7de5bb49d59597803d41c Reviewed-on: https://gerrit.libreoffice.org/43453 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
author: Stephan Bergmann <sbergman@redhat.com> 2017-10-17 12:38:40 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2017-10-17 14:29:11 +0200
commit: 4e9ebc6de44b22418f26fb6d931bedcc5d936906 (patch)
tree: fb0f9a2290d398ca33af6d8276d4827423122833 /lotuswordpro
parent: d6831a8a34257789a920491747e12ebe62f927fe (diff)
185 files changed, 566 insertions, 561 deletions
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 7393590c9087..72eb082e5b2c 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -11,6 +11,11 @@ $(eval $(call gb_Library_Library,lwpft))
 
 $(eval $(call gb_Library_use_sdk_api,lwpft))
 
+$(eval $(call gb_Library_set_include,lwpft, \
+    $$(INCLUDE) \
+    -I$(SRCDIR)/lotuswordpro/inc \
+))
+
 $(eval $(call gb_Library_set_precompiled_header,lwpft,$(SRCDIR)/lotuswordpro/inc/pch/precompiled_lwpft))
 
 $(eval $(call gb_Library_use_libraries,lwpft,\
diff --git a/lotuswordpro/source/filter/localtime.hxx b/lotuswordpro/inc/localtime.hxx
index 67784ca7dbcb..1722b60d3293 100644
--- a/lotuswordpro/source/filter/localtime.hxx
+++ b/lotuswordpro/inc/localtime.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LOCALTIME_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LOCALTIME_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LOCALTIME_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LOCALTIME_HXX
 
 struct LtTm
 {
diff --git a/lotuswordpro/source/filter/lwpatomholder.hxx b/lotuswordpro/inc/lwpatomholder.hxx
index e9ad25a727a0..3e373f7265b9 100644
--- a/lotuswordpro/source/filter/lwpatomholder.hxx
+++ b/lotuswordpro/inc/lwpatomholder.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPATOMHOLDER_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPATOMHOLDER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPATOMHOLDER_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPATOMHOLDER_HXX
 
 #include "lwpheader.hxx"
 #include "lwpdefs.hxx"
diff --git a/lotuswordpro/source/filter/lwpbasetype.hxx b/lotuswordpro/inc/lwpbasetype.hxx
index 71b8a7ed41ee..7da677280c4c 100644
--- a/lotuswordpro/source/filter/lwpbasetype.hxx
+++ b/lotuswordpro/inc/lwpbasetype.hxx
@@ -59,8 +59,8 @@
  *  PanoseNumber, Point
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBASETYPE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBASETYPE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPBASETYPE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPBASETYPE_HXX
 
 #include "lwpobjstrm.hxx"
 #include "lwpheader.hxx"
diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.hxx b/lotuswordpro/inc/lwpbookmarkmgr.hxx
index 6f471b7302b1..08ea7e35c803 100644
--- a/lotuswordpro/source/filter/lwpbookmarkmgr.hxx
+++ b/lotuswordpro/inc/lwpbookmarkmgr.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBOOKMARKMGR_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBOOKMARKMGR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPBOOKMARKMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPBOOKMARKMGR_HXX
 
 #include "lwpfilehdr.hxx"
 #include <map>
diff --git a/lotuswordpro/source/filter/lwpchangemgr.hxx b/lotuswordpro/inc/lwpchangemgr.hxx
index b90181582987..914c6af91df6 100644
--- a/lotuswordpro/source/filter/lwpchangemgr.hxx
+++ b/lotuswordpro/inc/lwpchangemgr.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHANGEMGR_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHANGEMGR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPCHANGEMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPCHANGEMGR_HXX
 
 #include <map>
 #include <vector>
diff --git a/lotuswordpro/source/filter/lwpcolor.hxx b/lotuswordpro/inc/lwpcolor.hxx
index fbc3a7214105..d6d3b02a63b7 100644
--- a/lotuswordpro/source/filter/lwpcolor.hxx
+++ b/lotuswordpro/inc/lwpcolor.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCOLOR_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCOLOR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPCOLOR_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPCOLOR_HXX
 
 #include "lwpobjstrm.hxx"
 #include "lwpheader.hxx"
diff --git a/lotuswordpro/source/filter/lwpdefs.hxx b/lotuswordpro/inc/lwpdefs.hxx
index 88f888569d8b..02df11566baf 100644
--- a/lotuswordpro/source/filter/lwpdefs.hxx
+++ b/lotuswordpro/inc/lwpdefs.hxx
@@ -58,8 +58,8 @@
  *  definitions for all object types VO_TYPE
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDEFS_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDEFS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPDEFS_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPDEFS_HXX
 
 #define BAD_OFFSET 0xFFFFFFFFUL
 #define BAD_ATOM ((sal_Int32)(-1))              // Invalid Atom ID
diff --git a/lotuswordpro/source/filter/lwpdocdata.hxx b/lotuswordpro/inc/lwpdocdata.hxx
index 6c1a24992274..68abe847d8eb 100644
--- a/lotuswordpro/source/filter/lwpdocdata.hxx
+++ b/lotuswordpro/inc/lwpdocdata.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDOCDATA_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDOCDATA_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPDOCDATA_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPDOCDATA_HXX
 #include "lwpobj.hxx"
 #include "lwpatomholder.hxx"
 #include "localtime.hxx"
diff --git a/lotuswordpro/source/filter/lwpdropcapmgr.hxx b/lotuswordpro/inc/lwpdropcapmgr.hxx
index 7d2bf8684ecb..c46954eaa000 100644
--- a/lotuswordpro/source/filter/lwpdropcapmgr.hxx
+++ b/lotuswordpro/inc/lwpdropcapmgr.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDROPCAPMGR_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDROPCAPMGR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPDROPCAPMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPDROPCAPMGR_HXX
 
 #include "xfilter/xfparagraph.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpfilehdr.hxx b/lotuswordpro/inc/lwpfilehdr.hxx
index acb303b7d792..ef444b12eb2b 100644
--- a/lotuswordpro/source/filter/lwpfilehdr.hxx
+++ b/lotuswordpro/inc/lwpfilehdr.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFILEHDR_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFILEHDR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPFILEHDR_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPFILEHDR_HXX
 
 #include "lwpobjid.hxx"
 /**
diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/inc/lwpfont.hxx
index 1f6987fdea3a..c7b6c3f5484a 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/inc/lwpfont.hxx
@@ -61,8 +61,8 @@
  * LwpFontManager
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFONT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFONT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPFONT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPFONT_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/inc/lwpfoundry.hxx
index cbbcd0510b58..7c5ff3bee569 100644
--- a/lotuswordpro/source/filter/lwpfoundry.hxx
+++ b/lotuswordpro/inc/lwpfoundry.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFOUNDRY_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFOUNDRY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPFOUNDRY_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPFOUNDRY_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobjid.hxx"
diff --git a/lotuswordpro/source/filter/lwpfrib.hxx b/lotuswordpro/inc/lwpfrib.hxx
index 910f85dee08f..4e824c0002f4 100644
--- a/lotuswordpro/source/filter/lwpfrib.hxx
+++ b/lotuswordpro/inc/lwpfrib.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIB_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIB_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPFRIB_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPFRIB_HXX
 #include <memory>
 #include "lwpobjid.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/source/filter/lwpglobalmgr.hxx b/lotuswordpro/inc/lwpglobalmgr.hxx
index 1cad0da4e6da..32a290f0d4a1 100644
--- a/lotuswordpro/source/filter/lwpglobalmgr.hxx
+++ b/lotuswordpro/inc/lwpglobalmgr.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPGLOBALMGR_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPGLOBALMGR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPGLOBALMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPGLOBALMGR_HXX
 
 #include <memory>
 #include <map>
diff --git a/lotuswordpro/source/filter/lwpheader.hxx b/lotuswordpro/inc/lwpheader.hxx
index 0643a9918209..ea96137e383a 100644
--- a/lotuswordpro/source/filter/lwpheader.hxx
+++ b/lotuswordpro/inc/lwpheader.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  */
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHEADER_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHEADER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPHEADER_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPHEADER_HXX
 
 #include <config_lgpl.h>
 #include <math.h>
diff --git a/lotuswordpro/source/filter/lwpidxmgr.hxx b/lotuswordpro/inc/lwpidxmgr.hxx
index b87a3367cb74..21f902a76cda 100644
--- a/lotuswordpro/source/filter/lwpidxmgr.hxx
+++ b/lotuswordpro/inc/lwpidxmgr.hxx
@@ -58,8 +58,8 @@
  *  index manager, to maintain the map between object id and offset
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPIDXMGR_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPIDXMGR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPIDXMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPIDXMGR_HXX
 
 #include <rtl/ustring.hxx>
 #include "lwpobjhdr.hxx"
diff --git a/lotuswordpro/source/filter/lwpobj.hxx b/lotuswordpro/inc/lwpobj.hxx
index d4fc9c780f2d..df38746f49f7 100644
--- a/lotuswordpro/source/filter/lwpobj.hxx
+++ b/lotuswordpro/inc/lwpobj.hxx
@@ -58,8 +58,8 @@
  *  Base class of all Lwp VO objects
  */
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJ_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJ_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPOBJ_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPOBJ_HXX
 
 #include <memory>
 #include <sal/config.h>
diff --git a/lotuswordpro/source/filter/lwpobjfactory.hxx b/lotuswordpro/inc/lwpobjfactory.hxx
index f28228987f72..37c3c3a48420 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.hxx
+++ b/lotuswordpro/inc/lwpobjfactory.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJFACTORY_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJFACTORY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPOBJFACTORY_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPOBJFACTORY_HXX
 
 #include <sal/config.h>
 
diff --git a/lotuswordpro/source/filter/lwpobjhdr.hxx b/lotuswordpro/inc/lwpobjhdr.hxx
index f08fdfeff82b..7c270aff5d34 100644
--- a/lotuswordpro/source/filter/lwpobjhdr.hxx
+++ b/lotuswordpro/inc/lwpobjhdr.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJHDR_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJHDR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPOBJHDR_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPOBJHDR_HXX
 
 #include "lwpobjid.hxx"
 #include "lwpobjtags.hxx"
diff --git a/lotuswordpro/source/filter/lwpobjid.hxx b/lotuswordpro/inc/lwpobjid.hxx
index 5a165d240be7..f6ae47f8a53c 100644
--- a/lotuswordpro/source/filter/lwpobjid.hxx
+++ b/lotuswordpro/inc/lwpobjid.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJID_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJID_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPOBJID_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPOBJID_HXX
 
 #include <sal/config.h>
 
diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx b/lotuswordpro/inc/lwpobjstrm.hxx
index 28efe29016a3..bbcfd3af2a91 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.hxx
+++ b/lotuswordpro/inc/lwpobjstrm.hxx
@@ -59,8 +59,8 @@
  *  stream for one LwpObject body data
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJSTRM_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJSTRM_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPOBJSTRM_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPOBJSTRM_HXX
 
 #include "lwpheader.hxx"
 #include "lwpsvstream.hxx"
diff --git a/lotuswordpro/source/filter/lwpobjtags.hxx b/lotuswordpro/inc/lwpobjtags.hxx
index 687f53394df0..9d011c338333 100644
--- a/lotuswordpro/source/filter/lwpobjtags.hxx
+++ b/lotuswordpro/inc/lwpobjtags.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJTAGS_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJTAGS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPOBJTAGS_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPOBJTAGS_HXX
 
 // file header object
 #define TAG_AMI             0x3750574CUL        // "LWP7"
diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/inc/lwpoverride.hxx
index 935fd0f7bbbe..b7d0752fa664 100644
--- a/lotuswordpro/source/filter/lwpoverride.hxx
+++ b/lotuswordpro/inc/lwpoverride.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOVERRIDE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOVERRIDE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPOVERRIDE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPOVERRIDE_HXX
 
 #include "lwpobjid.hxx"
 #include "lwptools.hxx"
diff --git a/lotuswordpro/source/filter/lwpsvstream.hxx b/lotuswordpro/inc/lwpsvstream.hxx
index 1ef034cebae3..f151dafc982e 100644
--- a/lotuswordpro/source/filter/lwpsvstream.hxx
+++ b/lotuswordpro/inc/lwpsvstream.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSVSTREAM_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSVSTREAM_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPSVSTREAM_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPSVSTREAM_HXX
 
 #include "lwpheader.hxx"
 
diff --git a/lotuswordpro/source/filter/lwptools.hxx b/lotuswordpro/inc/lwptools.hxx
index 457b2ac12eb2..e8bdc818af77 100644
--- a/lotuswordpro/source/filter/lwptools.hxx
+++ b/lotuswordpro/inc/lwptools.hxx
@@ -58,8 +58,8 @@
  *  to provide basic utilities for word pro filter
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTOOLS_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTOOLS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_LWPTOOLS_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_LWPTOOLS_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx b/lotuswordpro/inc/xfilter/ixfattrlist.hxx
index 82b7820930b3..0867cf6d3929 100644
--- a/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx
+++ b/lotuswordpro/inc/xfilter/ixfattrlist.hxx
@@ -57,8 +57,8 @@
  * @file
  * Interface for the attribute list of a xml element.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFATTRLIST_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFATTRLIST_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_IXFATTRLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_IXFATTRLIST_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -83,6 +83,6 @@ public:
     virtual void    Clear() = 0;
 };
 
-#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFATTRLIST_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/ixfstream.hxx b/lotuswordpro/inc/xfilter/ixfstream.hxx
index cc3c0494ef57..922e79952058 100644
--- a/lotuswordpro/source/filter/xfilter/ixfstream.hxx
+++ b/lotuswordpro/inc/xfilter/ixfstream.hxx
@@ -57,8 +57,8 @@
  * @file
  * Sax stream to export xml to SODC.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFSTREAM_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFSTREAM_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_IXFSTREAM_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_IXFSTREAM_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -107,5 +107,5 @@ public:
     virtual IXFAttrList*    GetAttrList() = 0;
 };
 
-#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFSTREAM_HXX
+#endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx b/lotuswordpro/inc/xfilter/ixfstyle.hxx
index c870e2be8dbf..16c3abd4d21e 100644
--- a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx
+++ b/lotuswordpro/inc/xfilter/ixfstyle.hxx
@@ -57,10 +57,10 @@
  * @file
  * Interfer for all style object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_IXFSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_IXFSTYLE_HXX
 
-#include "xfglobal.hxx"
+#include "xfilter/xfglobal.hxx"
 /**
  * @descr
  * Interface for all style object.
diff --git a/lotuswordpro/source/filter/xfilter/xfannotation.hxx b/lotuswordpro/inc/xfilter/xfannotation.hxx
index 226c1dd90601..c0040a554216 100644
--- a/lotuswordpro/source/filter/xfilter/xfannotation.hxx
+++ b/lotuswordpro/inc/xfilter/xfannotation.hxx
@@ -57,12 +57,12 @@
  * @file
  * Annotation object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFANNOTATION_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFANNOTATION_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFANNOTATION_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFANNOTATION_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 
 class XFAnnotation : public XFContentContainer
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx b/lotuswordpro/inc/xfilter/xfarrowstyle.hxx
index 671165448d5a..76c72318b827 100644
--- a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfarrowstyle.hxx
@@ -57,10 +57,10 @@
  * @file
  * Line Arrow.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFARROWSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFARROWSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFARROWSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFARROWSTYLE_HXX
 
-#include "xfstyle.hxx"
+#include "xfilter/xfstyle.hxx"
 
 class XFArrowStyle : public XFStyle
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx b/lotuswordpro/inc/xfilter/xfbgimage.hxx
index fb6a2193211a..1622c12ced02 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
+++ b/lotuswordpro/inc/xfilter/xfbgimage.hxx
@@ -57,10 +57,10 @@
  * @file
  * Background image.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBGIMAGE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBGIMAGE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBGIMAGE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBGIMAGE_HXX
 
-#include "xfstyle.hxx"
+#include "xfilter/xfstyle.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx b/lotuswordpro/inc/xfilter/xfbookmark.hxx
index 122675a0a4ee..a03869bf3686 100644
--- a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
+++ b/lotuswordpro/inc/xfilter/xfbookmark.hxx
@@ -57,14 +57,14 @@
  * @file
  * Bookmark ref.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBOOKMARK_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBOOKMARK_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBOOKMARK_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBOOKMARK_HXX
 
 #include <sal/config.h>
 
-#include "ixfattrlist.hxx"
-#include "ixfstream.hxx"
-#include "xfcontent.hxx"
+#include "xfilter/ixfattrlist.hxx"
+#include "xfilter/ixfstream.hxx"
+#include "xfilter/xfcontent.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.hxx b/lotuswordpro/inc/xfilter/xfborders.hxx
index dc2cd4b705ef..e46b11c0c879 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.hxx
+++ b/lotuswordpro/inc/xfilter/xfborders.hxx
@@ -57,11 +57,11 @@
  * @file
  * Border object,now only used by paragraph object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBORDERS_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBORDERS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBORDERS_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBORDERS_HXX
 
-#include "xfglobal.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcolor.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx b/lotuswordpro/inc/xfilter/xfbreaks.hxx
index 59a39c675d7b..f8b078c4d7b8 100644
--- a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
+++ b/lotuswordpro/inc/xfilter/xfbreaks.hxx
@@ -57,10 +57,10 @@
  * @file
  * Breaks of paragraph.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBREAKS_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBREAKS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBREAKS_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBREAKS_HXX
 
-#include "xfglobal.hxx"
+#include "xfilter/xfglobal.hxx"
 
 /**
  * @descr   Page|Column break object.
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/inc/xfilter/xfcell.hxx
index fceef5aad34c..04bfadb782d9 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.hxx
+++ b/lotuswordpro/inc/xfilter/xfcell.hxx
@@ -58,11 +58,11 @@
  * Table cell.
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCELL_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCELL_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCELL_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCELL_HXX
 
-#include "xfcontent.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 #include <vector>
 
 class XFTable;
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/inc/xfilter/xfcellstyle.hxx
index f8b2f5cf3484..c2d631859f8e 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfcellstyle.hxx
@@ -57,18 +57,18 @@
  * @file
  * Table cell style. Number format, string value, and so on...
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCELLSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCELLSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCELLSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCELLSTYLE_HXX
 
 #include <sal/config.h>
 
 #include <rtl/ref.hxx>
 
-#include "xfstyle.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfcolor.hxx"
 #include "xfmargins.hxx"
-#include "xfpadding.hxx"
-#include "xfshadow.hxx"
+#include "xfilter/xfpadding.hxx"
+#include "xfilter/xfshadow.hxx"
 
 #include <memory>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfchange.hxx b/lotuswordpro/inc/xfilter/xfchange.hxx
index 6d45c5b066da..c6914adf756a 100644
--- a/lotuswordpro/source/filter/xfilter/xfchange.hxx
+++ b/lotuswordpro/inc/xfilter/xfchange.hxx
@@ -58,13 +58,13 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCHANGE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCHANGE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCHANGE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCHANGE_HXX
 
-#include "xfglobal.hxx"
-#include "ixfstream.hxx"
-#include "xfcontent.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/ixfstream.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 #include <rtl/ustring.hxx>
 
 class XFChangeList : public XFContentContainer
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.hxx b/lotuswordpro/inc/xfilter/xfcolor.hxx
index 5b024cfb6254..d095e68dae0f 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.hxx
+++ b/lotuswordpro/inc/xfilter/xfcolor.hxx
@@ -57,8 +57,8 @@
  * @file
  * Color object to serial to xml filter.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLOR_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLOR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLOR_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLOR_HXX
 
 #include "xfglobal.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx b/lotuswordpro/inc/xfilter/xfcolstyle.hxx
index c63ce5dbf8ee..5fdfe6b22c67 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfcolstyle.hxx
@@ -57,10 +57,10 @@
  * @file
  * Column style object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLSTYLE_HXX
 
-#include "xfstyle.hxx"
+#include "xfilter/xfstyle.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/inc/xfilter/xfcolumns.hxx
index a0fcc310148a..bdfc04cd4272 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
+++ b/lotuswordpro/inc/xfilter/xfcolumns.hxx
@@ -57,11 +57,11 @@
  * @file
  * Columns styles for section, or paragraph.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLUMNS_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLUMNS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLUMNS_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLUMNS_HXX
 
-#include "xfglobal.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcolor.hxx"
 #include <vector>
 
 #define     XFCOLUMNS_FLAG_SEPARATOR    0X00000001
diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx b/lotuswordpro/inc/xfilter/xfconfigmanager.hxx
index 526129abfd0c..941020be85eb 100644
--- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
+++ b/lotuswordpro/inc/xfilter/xfconfigmanager.hxx
@@ -57,14 +57,14 @@
  * @file
  * Manager for all config object,include line number config.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONFIGMANAGER_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONFIGMANAGER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCONFIGMANAGER_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCONFIGMANAGER_HXX
 
-#include "xfstylecont.hxx"
-#include "xflinenumberconfig.hxx"
-#include "xffootnoteconfig.hxx"
-#include "xfendnoteconfig.hxx"
-#include "xfdefs.hxx"
+#include "xfilter/xfstylecont.hxx"
+#include "xfilter/xflinenumberconfig.hxx"
+#include "xfilter/xffootnoteconfig.hxx"
+#include "xfilter/xfendnoteconfig.hxx"
+#include "xfilter/xfdefs.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfcontent.hxx b/lotuswordpro/inc/xfilter/xfcontent.hxx
index dae66be46237..a262238ffaa2 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontent.hxx
+++ b/lotuswordpro/inc/xfilter/xfcontent.hxx
@@ -57,8 +57,8 @@
  * @file
  * Base class for the all content object,ie. text,paragraph,picture,and so on.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCONTENT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCONTENT_HXX
 
 #include <sal/config.h>
 
@@ -66,7 +66,7 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <stdexcept>
 
-#include "xfdefs.hxx"
+#include "xfilter/xfdefs.hxx"
 
 class IXFStream;
 
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/inc/xfilter/xfcontentcontainer.hxx
index ba9100e1d66b..0717e3f4a371 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
+++ b/lotuswordpro/inc/xfilter/xfcontentcontainer.hxx
@@ -57,8 +57,8 @@
  * @file
  * Container for content.It will destroy all children when destroy.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENTCONTAINER_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENTCONTAINER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCONTENTCONTAINER_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCONTENTCONTAINER_HXX
 
 #include <sal/config.h>
 
@@ -66,7 +66,7 @@
 
 #include <rtl/ref.hxx>
 
-#include "xfcontent.hxx"
+#include "xfilter/xfcontent.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx b/lotuswordpro/inc/xfilter/xfcrossref.hxx
index 79d55a936b93..22240ea6f02c 100644
--- a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
+++ b/lotuswordpro/inc/xfilter/xfcrossref.hxx
@@ -57,10 +57,10 @@
  * @file
  * cross reference object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCROSSREF_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCROSSREF_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCROSSREF_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCROSSREF_HXX
 
-#include "xfcontent.hxx"
+#include "xfilter/xfcontent.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/inc/xfilter/xfdate.hxx
index 5ad771550d6a..66a4f385f99a 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.hxx
+++ b/lotuswordpro/inc/xfilter/xfdate.hxx
@@ -57,11 +57,11 @@
  * @file
  * Date field with date style.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDATE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDATE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATE_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
 
 /**
  * @descr   Date object.
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/inc/xfilter/xfdatestyle.hxx
index bacf9ee5ac95..89f2f69fc164 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfdatestyle.hxx
@@ -57,13 +57,13 @@
  * @file
  * Date style. The date format for date field.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDATESTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDATESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATESTYLE_HXX
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
-#include "xftimestyle.hxx"
-#include "xfstylecont.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/source/filter/xfilter/xfdefs.hxx b/lotuswordpro/inc/xfilter/xfdefs.hxx
index ff814a355966..3211ef22899b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdefs.hxx
+++ b/lotuswordpro/inc/xfilter/xfdefs.hxx
@@ -57,8 +57,8 @@
  * @file
  * enum const defines.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDEFS_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDEFS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDEFS_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDEFS_HXX
 
 #include <sal/types.h>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx b/lotuswordpro/inc/xfilter/xfdocfield.hxx
index 36828a9e8ae5..2c99ff846d20 100644
--- a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
+++ b/lotuswordpro/inc/xfilter/xfdocfield.hxx
@@ -57,11 +57,11 @@
  * @file
  * doc field.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDOCFIELD_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDOCFIELD_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDOCFIELD_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDOCFIELD_HXX
 
-#include "xfcontent.hxx"
-#include "xfpagecount.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfpagecount.hxx"
 
 class XFFileName : public XFContent
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx b/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
index de9d73e45f0b..be3ca3f17899 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
@@ -57,12 +57,12 @@
  * @file
  * Group of drawing objects.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWGROUP_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWGROUP_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWGROUP_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWGROUP_HXX
 
-#include "xfdrawobj.hxx"
+#include "xfilter/xfdrawobj.hxx"
 #include "xfframe.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.hxx b/lotuswordpro/inc/xfilter/xfdrawline.hxx
index 219174ef9bd6..b1d9dc9342f1 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawline.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawline.hxx
@@ -57,11 +57,11 @@
  * @file
  * Line object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWLINE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWLINE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWLINE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWLINE_HXX
 
-#include "xfdrawobj.hxx"
-#include "xfpoint.hxx"
+#include "xfilter/xfdrawobj.hxx"
+#include "xfilter/xfpoint.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx b/lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx
index b450f499b9eb..faddd411ea13 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx
@@ -57,11 +57,11 @@
  * @file
  * Line style of Drawing object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWLINESTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWLINESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWLINESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWLINESTYLE_HXX
 
-#include "xfstyle.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfcolor.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/inc/xfilter/xfdrawobj.hxx
index 03ee0e3bc41f..8299b2be5112 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawobj.hxx
@@ -57,11 +57,11 @@
  * @file
  * Interfer for all Drawing object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWOBJ_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWOBJ_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWOBJ_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWOBJ_HXX
 
-#include "xfframe.hxx"
-#include "xfrect.hxx"
+#include "xfilter/xfframe.hxx"
+#include "xfilter/xfrect.hxx"
 
 #define     XFDRAWOBJECT_FLAG_ROTATE    0X00000001
 #define     XFDRAWOBJECT_FLAG_TRANSLATE 0X00000002
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/inc/xfilter/xfdrawpath.hxx
index 486672469c3a..50f5785f7d5e 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawpath.hxx
@@ -57,10 +57,10 @@
  * @file
  * Draw path object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPATH_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPATH_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPATH_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPATH_HXX
 
-#include "xfdrawobj.hxx"
+#include "xfilter/xfdrawobj.hxx"
 #include <vector>
 
 /**
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx b/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx
index 649a6f9e2d82..2d3a4509a284 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx
@@ -57,8 +57,8 @@
  * @file
  * Polygon object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPOLYGON_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPOLYGON_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPOLYGON_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPOLYGON_HXX
 
 #include "xfdrawpolyline.hxx"
 #include <vector>
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx b/lotuswordpro/inc/xfilter/xfdrawpolyline.hxx
index 0a978d3184a9..00c1d28e42a3 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawpolyline.hxx
@@ -57,10 +57,10 @@
  * @file
  * Polyline.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPOLYLINE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPOLYLINE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPOLYLINE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPOLYLINE_HXX
 
-#include "xfdrawobj.hxx"
+#include "xfilter/xfdrawobj.hxx"
 #include <vector>
 
 class XFDrawPolyline : public XFDrawObject
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx b/lotuswordpro/inc/xfilter/xfdrawrect.hxx
index 412b51f7405a..6b20858b7af2 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawrect.hxx
@@ -57,10 +57,10 @@
  * @file
  * Rect object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWRECT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWRECT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWRECT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWRECT_HXX
 
-#include "xfdrawobj.hxx"
+#include "xfilter/xfdrawobj.hxx"
 
 class XFDrawRect : public XFDrawObject
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/inc/xfilter/xfdrawstyle.hxx
index 0d2469035867..d5235ef953f2 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawstyle.hxx
@@ -57,11 +57,11 @@
  * @file
  * Style for all draw object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWSTYLE_HXX
 
-#include "xfstyle.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfcolor.hxx"
 #include <cassert>
 
 class XFDrawLineStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx b/lotuswordpro/inc/xfilter/xfdropcap.hxx
index 4813262d55b2..1856a73ef55b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
+++ b/lotuswordpro/inc/xfilter/xfdropcap.hxx
@@ -57,10 +57,10 @@
  * @file
  * Drop cap of a paragraph.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDROPCAP_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDROPCAP_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDROPCAP_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDROPCAP_HXX
 
-#include "xfglobal.hxx"
+#include "xfilter/xfglobal.hxx"
 
 class XFDropcap
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx b/lotuswordpro/inc/xfilter/xfendnote.hxx
index 15aaa7f76a6a..239bd38930d4 100644
--- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx
+++ b/lotuswordpro/inc/xfilter/xfendnote.hxx
@@ -57,12 +57,12 @@
  * @file
  * End note object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENDNOTE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENDNOTE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENDNOTE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENDNOTE_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx b/lotuswordpro/inc/xfilter/xfendnoteconfig.hxx
index 5e4519d0b032..53c8d218dab8 100644
--- a/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx
+++ b/lotuswordpro/inc/xfilter/xfendnoteconfig.hxx
@@ -57,8 +57,8 @@
  * @file
  * Endnote config.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENDNOTECONFIG_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENDNOTECONFIG_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENDNOTECONFIG_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENDNOTECONFIG_HXX
 
 class XFEndnoteConfig : public XFFootnoteConfig
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/inc/xfilter/xfentry.hxx
index 8195f42d0c2a..1c1d50cec47a 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.hxx
+++ b/lotuswordpro/inc/xfilter/xfentry.hxx
@@ -57,10 +57,10 @@
  * @file
  * index entry object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENTRY_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENTRY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENTRY_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENTRY_HXX
 
-#include "xfcontent.hxx"
+#include "xfilter/xfcontent.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx b/lotuswordpro/inc/xfilter/xffloatframe.hxx
index 0931c6da62b1..812de6335383 100644
--- a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
+++ b/lotuswordpro/inc/xfilter/xffloatframe.hxx
@@ -57,8 +57,8 @@
  * @file
  * Float frame whose anchor is page.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFLOATFRAME_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFLOATFRAME_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFLOATFRAME_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFLOATFRAME_HXX
 
 #include "xfframe.hxx"
 #include <vector>
diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/inc/xfilter/xffont.hxx
index ea68136e61a9..b5b472456789 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.hxx
+++ b/lotuswordpro/inc/xfilter/xffont.hxx
@@ -57,15 +57,15 @@
  * @file
  * Font object to serial to xml filter.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFONT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFONT_HXX
 
 #include <sal/config.h>
 
 #include <salhelper/simplereferenceobject.hxx>
 
-#include "xfglobal.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcolor.hxx"
 
 #define     XFFONT_FLAG_NAME            0X00000001
 #define     XFFONT_FLAG_NAME_ASIA       0X00000002
diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx b/lotuswordpro/inc/xfilter/xffontdecl.hxx
index a2bb7e5ec5c2..a65b267265a5 100644
--- a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
+++ b/lotuswordpro/inc/xfilter/xffontdecl.hxx
@@ -58,10 +58,10 @@
  * Font declaration for OOo xml file.This is needed for every font that was
  * used.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTDECL_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTDECL_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFONTDECL_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFONTDECL_HXX
 
-#include "xfglobal.hxx"
+#include "xfilter/xfglobal.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.hxx b/lotuswordpro/inc/xfilter/xffontfactory.hxx
index d1ab37a70fd2..ff357ba186dc 100644
--- a/lotuswordpro/source/filter/xfilter/xffontfactory.hxx
+++ b/lotuswordpro/inc/xfilter/xffontfactory.hxx
@@ -57,15 +57,15 @@
  * @file
  * Factory object for XFFont.It also manages all font life cycle.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTFACTORY_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTFACTORY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFONTFACTORY_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFONTFACTORY_HXX
 
 #include <sal/config.h>
 
 #include <rtl/ref.hxx>
 
 #include "xfglobal.hxx"
-#include "xffont.hxx"
+#include "xfilter/xffont.hxx"
 #include <vector>
 
 /**
diff --git a/lotuswordpro/source/filter/xfilter/xffooter.hxx b/lotuswordpro/inc/xfilter/xffooter.hxx
index 514891834d25..4f6326a28253 100644
--- a/lotuswordpro/source/filter/xfilter/xffooter.hxx
+++ b/lotuswordpro/inc/xfilter/xffooter.hxx
@@ -57,10 +57,10 @@
  * @file
  * Footer object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTER_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTER_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTER_HXX
 
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 #include <vector>
 
 /**
diff --git a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx b/lotuswordpro/inc/xfilter/xffooterstyle.hxx
index dfc82da7517c..1e633fd442be 100644
--- a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xffooterstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Footer style,exist in page-master object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTERSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTERSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTERSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTERSTYLE_HXX
 
 #include "xfheaderstyle.hxx"
 #include "xfmargins.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xffootnote.hxx b/lotuswordpro/inc/xfilter/xffootnote.hxx
index d80b14d9ccdc..03c795714f41 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnote.hxx
+++ b/lotuswordpro/inc/xfilter/xffootnote.hxx
@@ -57,12 +57,12 @@
  * @file
  * Foot note object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTNOTE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTNOTE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTE_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx
index da6a6615ef0b..95684ed61d78 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
+++ b/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx
@@ -57,10 +57,10 @@
  * @file
  * Footnote config.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTNOTECONFIG_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTNOTECONFIG_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTECONFIG_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTECONFIG_HXX
 
-#include "xfstyle.hxx"
+#include "xfilter/xfstyle.hxx"
 
 class XFFootnoteConfig : public XFStyle
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/inc/xfilter/xfframe.hxx
index 143635e9f728..a651e4cbdbad 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.hxx
+++ b/lotuswordpro/inc/xfilter/xfframe.hxx
@@ -58,13 +58,13 @@
  * Frame object for OOo.This is the basic object for all Shape Layer.
  * You can reference to the XFFrame object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFRAME_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFRAME_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAME_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAME_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
 #include "xfrect.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 
 #define     XFFRAME_FLAG_HEIGHT         0x00000001
 #define     XFFRAME_FLAG_MINHEIGHT      0x00000002
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/inc/xfilter/xfframestyle.hxx
index 9d91d6ec34a9..17df50efc048 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfframestyle.hxx
@@ -58,14 +58,14 @@
  * Frame object style for OOo.
  * You can reference to the XFFrame object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFRAMESTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFRAMESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAMESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAMESTYLE_HXX
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
 #include "xfmargins.hxx"
-#include "xfcolor.hxx"
-#include "xfpadding.hxx"
+#include "xfilter/xfcolor.hxx"
+#include "xfilter/xfpadding.hxx"
 
 class XFBorders;
 class XFColumns;
diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.hxx b/lotuswordpro/inc/xfilter/xfglobal.hxx
index c5b6939c355e..5b829a8382c4 100644
--- a/lotuswordpro/source/filter/xfilter/xfglobal.hxx
+++ b/lotuswordpro/inc/xfilter/xfglobal.hxx
@@ -58,8 +58,8 @@
  * Global functions or include files that are needed.
  * It's all for the full filter.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFGLOBAL_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFGLOBAL_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFGLOBAL_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFGLOBAL_HXX
 
 #include <cassert>
 
@@ -67,11 +67,11 @@
 
 #include <rtl/ustring.hxx>
 
-#include "ixfstream.hxx"
-#include "ixfattrlist.hxx"
+#include "xfilter/ixfstream.hxx"
+#include "xfilter/ixfattrlist.hxx"
 
-#include "xfutil.hxx"
-#include "xfdefs.hxx"
+#include "xfilter/xfutil.hxx"
+#include "xfilter/xfdefs.hxx"
 
 #define PI 3.1415926
 #define FLOAT_MIN   0.001
diff --git a/lotuswordpro/source/filter/xfilter/xfheader.hxx b/lotuswordpro/inc/xfilter/xfheader.hxx
index 31e917d9a134..511a7036f6d1 100644
--- a/lotuswordpro/source/filter/xfilter/xfheader.hxx
+++ b/lotuswordpro/inc/xfilter/xfheader.hxx
@@ -57,11 +57,11 @@
  * @file
  * Header object. Sub object of master page.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHEADER_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHEADER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHEADER_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHEADER_HXX
 
-#include "xfcontentcontainer.hxx"
-#include "xfparagraph.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
+#include "xfilter/xfparagraph.hxx"
 #include <vector>
 
 class XFHeader : public XFContentContainer
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx b/lotuswordpro/inc/xfilter/xfheaderstyle.hxx
index c53ba2caf9cf..0c5902034033 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfheaderstyle.hxx
@@ -57,14 +57,14 @@
  * @file
  * Header style,exist in page-master object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHEADERSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHEADERSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHEADERSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHEADERSTYLE_HXX
 
-#include "xfstyle.hxx"
+#include "xfilter/xfstyle.hxx"
 #include "xfmargins.hxx"
 #include "xfborders.hxx"
-#include "xfpadding.hxx"
-#include "xfshadow.hxx"
+#include "xfilter/xfpadding.hxx"
+#include "xfilter/xfshadow.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx b/lotuswordpro/inc/xfilter/xfhyperlink.hxx
index 6bf3eecdbf47..15e49c14d71e 100644
--- a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
+++ b/lotuswordpro/inc/xfilter/xfhyperlink.hxx
@@ -57,8 +57,8 @@
  * @file
  * Hyperlink object for OOo xml filter.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHYPERLINK_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHYPERLINK_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHYPERLINK_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHYPERLINK_HXX
 
 class XFHyperlink : public XFContent
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.hxx b/lotuswordpro/inc/xfilter/xfimage.hxx
index de4f22fa321c..1df8955a2fa2 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.hxx
+++ b/lotuswordpro/inc/xfilter/xfimage.hxx
@@ -57,8 +57,8 @@
  * @file
  * Image object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFIMAGE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFIMAGE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFIMAGE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFIMAGE_HXX
 
 #include "xfframe.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx b/lotuswordpro/inc/xfilter/xfimagestyle.hxx
index 32615e09bbb0..36f563971fc0 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfimagestyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Image style object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFIMAGESTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFIMAGESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFIMAGESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFIMAGESTYLE_HXX
 
 #include "xfframestyle.hxx"
 #include "xfrect.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/inc/xfilter/xfindex.hxx
index 9f32e464c833..8d613bcb7432 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.hxx
+++ b/lotuswordpro/inc/xfilter/xfindex.hxx
@@ -57,13 +57,13 @@
  * @file
  * Represente index source,index body and index index entry.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFINDEX_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFINDEX_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFINDEX_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFINDEX_HXX
 #include <map>
 #include <vector>
 
-#include "xfcontent.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 #include "xftabstop.hxx"
 
 class XFIndex;
diff --git a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx b/lotuswordpro/inc/xfilter/xfinputlist.hxx
index 85323504db8e..e938c42ac755 100644
--- a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
+++ b/lotuswordpro/inc/xfilter/xfinputlist.hxx
@@ -57,10 +57,10 @@
  * @file
  * input list field.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFINPUTLIST_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFINPUTLIST_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFINPUTLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFINPUTLIST_HXX
 
-#include "xfcontent.hxx"
+#include "xfilter/xfcontent.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xflinebreak.hxx b/lotuswordpro/inc/xfilter/xflinebreak.hxx
index e7c7648087c2..9052c35a4cad 100644
--- a/lotuswordpro/source/filter/xfilter/xflinebreak.hxx
+++ b/lotuswordpro/inc/xfilter/xflinebreak.hxx
@@ -57,11 +57,11 @@
  * @file
  * Line break object,<text:line-break/>
  *************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINEBREAK_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINEBREAK_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINEBREAK_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINEBREAK_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
 
 class XFLineBreak : public XFContent
 {
diff --git a/lotuswordpro/source/filter/xfilter/xflineheight.hxx b/lotuswordpro/inc/xfilter/xflineheight.hxx
index 7f7ded192542..f03fd93e667d 100644
--- a/lotuswordpro/source/filter/xfilter/xflineheight.hxx
+++ b/lotuswordpro/inc/xfilter/xflineheight.hxx
@@ -57,8 +57,8 @@
  * @file
  * Line height for paragraph.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINEHEIGHT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINEHEIGHT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINEHEIGHT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINEHEIGHT_HXX
 
 #include <string.h>
 
diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx
index 6d9a7cac5a9a..93fe00ae0d5b 100644
--- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
+++ b/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx
@@ -57,10 +57,10 @@
  * @file
  * Line numbering config for the full document.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINENUMBERCONFIG_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINENUMBERCONFIG_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINENUMBERCONFIG_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINENUMBERCONFIG_HXX
 
-#include "xfstyle.hxx"
+#include "xfilter/xfstyle.hxx"
 
 class XFLineNumberConfig : public XFStyle
 {
diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/inc/xfilter/xflist.hxx
index 547021a98145..865ee6c3ac12 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.hxx
+++ b/lotuswordpro/inc/xfilter/xflist.hxx
@@ -57,11 +57,11 @@
  * @file
  * Base list object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLIST_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLIST_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLIST_HXX
 
 #include "xflistitem.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 
 class XFListItem;
 
diff --git a/lotuswordpro/source/filter/xfilter/xflistitem.hxx b/lotuswordpro/inc/xfilter/xflistitem.hxx
index 65ce1e83e43f..1073be60ef63 100644
--- a/lotuswordpro/source/filter/xfilter/xflistitem.hxx
+++ b/lotuswordpro/inc/xfilter/xflistitem.hxx
@@ -57,12 +57,12 @@
  * @file
  * List item.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLISTITEM_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLISTITEM_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTITEM_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTITEM_HXX
 
-#include "xfcontent.hxx"
-#include "xfcontentcontainer.hxx"
-#include "xfparagraph.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
+#include "xfilter/xfparagraph.hxx"
 
 class   XFListItem : public XFContentContainer
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/inc/xfilter/xfliststyle.hxx
index 2d017f28fdc0..c51ef7079664 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfliststyle.hxx
@@ -57,12 +57,12 @@
 * @file
 * Styles for ordered list and unordered list.
 ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLISTSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLISTSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTSTYLE_HXX
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
-#include "xfnumfmt.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfnumfmt.hxx"
 #include "unicode/utypes.h"
 #include <vector>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.hxx b/lotuswordpro/inc/xfilter/xfmargins.hxx
index 42c385eeaddb..56b964477b8b 100644
--- a/lotuswordpro/source/filter/xfilter/xfmargins.hxx
+++ b/lotuswordpro/inc/xfilter/xfmargins.hxx
@@ -57,10 +57,10 @@
  * @file
  * Margins object, include left margin,right margin,top margin and bottom margin.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFMARGINS_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFMARGINS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMARGINS_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMARGINS_HXX
 
-#include "xfglobal.hxx"
+#include "xfilter/xfglobal.hxx"
 
 #define     XFMARGINS_FLAG_LEFT     0x00000001
 #define     XFMARGINS_FLAG_RIGHT    0x00000002
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx b/lotuswordpro/inc/xfilter/xfmasterpage.hxx
index 8a35db0d4b09..5c8c17140ff8 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
+++ b/lotuswordpro/inc/xfilter/xfmasterpage.hxx
@@ -57,11 +57,11 @@
  * @file
  * Master page object which was used to apply a layout to the pages.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFMASTERPAGE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFMASTERPAGE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMASTERPAGE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMASTERPAGE_HXX
 
-#include "xfstyle.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 
 class XFFooter;
 class XFHeader;
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
index 34c99753e110..4d4693a54c51 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
@@ -57,12 +57,12 @@
  * @file
  * Number style for table cell.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFNUMBERSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFNUMBERSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMBERSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMBERSTYLE_HXX
 
-#include "xfstyle.hxx"
-#include "xfstylemanager.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfstylemanager.hxx"
+#include "xfilter/xfcolor.hxx"
 #include <rtl/ustring.hxx>
 
 class XFNumberStyle : public XFStyle
diff --git a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx b/lotuswordpro/inc/xfilter/xfnumfmt.hxx
index b9cd1d3f2f46..e61d01058ae3 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
+++ b/lotuswordpro/inc/xfilter/xfnumfmt.hxx
@@ -57,10 +57,10 @@
  * @file
  * Number format. a),A),i),1),(1)
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFNUMFMT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFNUMFMT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMFMT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMFMT_HXX
 
-#include "xfglobal.hxx"
+#include "xfilter/xfglobal.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx b/lotuswordpro/inc/xfilter/xfofficemeta.hxx
index fe6032c81574..970dd4229a27 100644
--- a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
+++ b/lotuswordpro/inc/xfilter/xfofficemeta.hxx
@@ -58,10 +58,10 @@
  * Meta info for the full document.
  * You can see this by click: File->Properties.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFOFFICEMETA_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFOFFICEMETA_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFOFFICEMETA_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFOFFICEMETA_HXX
 
-#include "xfglobal.hxx"
+#include "xfilter/xfglobal.hxx"
 
 class XFOfficeMeta final
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfpadding.hxx b/lotuswordpro/inc/xfilter/xfpadding.hxx
index cd9b1ecd6400..d357a0e2172d 100644
--- a/lotuswordpro/source/filter/xfilter/xfpadding.hxx
+++ b/lotuswordpro/inc/xfilter/xfpadding.hxx
@@ -57,10 +57,10 @@
  * @file
  * Padding for paragraph.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPADDING_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPADDING_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPADDING_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPADDING_HXX
 
-#include "xfglobal.hxx"
+#include "xfilter/xfglobal.hxx"
 
 #define XFPADDING_FLAG_LEFT     0X00000001
 #define XFPADDING_FLAG_RIGHT    0X00000002
diff --git a/lotuswordpro/source/filter/xfilter/xfpagecount.hxx b/lotuswordpro/inc/xfilter/xfpagecount.hxx
index eaa6c073dd05..984e5f60da94 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagecount.hxx
+++ b/lotuswordpro/inc/xfilter/xfpagecount.hxx
@@ -57,12 +57,12 @@
  * @file
  * Page number field.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGECOUNT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGECOUNT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGECOUNT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGECOUNT_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
-#include "xfnumfmt.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfnumfmt.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/inc/xfilter/xfpagemaster.hxx
index 845d781608be..529dcdb1cb45 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
+++ b/lotuswordpro/inc/xfilter/xfpagemaster.hxx
@@ -58,12 +58,12 @@
  * Page master used bye XFMasterPage.
  * It is the real object to define header and footer of pages.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGEMASTER_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGEMASTER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGEMASTER_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGEMASTER_HXX
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfcolor.hxx"
 #include "xfmargins.hxx"
 
 class XFBorders;
diff --git a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx b/lotuswordpro/inc/xfilter/xfpagenumber.hxx
index 60a4c150e9ce..9de71288eaa8 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
+++ b/lotuswordpro/inc/xfilter/xfpagenumber.hxx
@@ -57,12 +57,12 @@
  * @file
  * Page number field.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGENUMBER_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGENUMBER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGENUMBER_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGENUMBER_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
-#include "xfnumfmt.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfnumfmt.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx b/lotuswordpro/inc/xfilter/xfparagraph.hxx
index 2aaf343d3132..b78ea1d28692 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
+++ b/lotuswordpro/inc/xfilter/xfparagraph.hxx
@@ -57,11 +57,11 @@
  * @file
  * Paragraph object of OOo, it will output <text:p >...</text:p> element.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPARAGRAPH_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPARAGRAPH_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPARAGRAPH_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPARAGRAPH_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 #include <vector>
 
 class IXFStream;
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/inc/xfilter/xfparastyle.hxx
index 555fd977ac8d..e8402df2bac6 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfparastyle.hxx
@@ -59,24 +59,24 @@
  * Styles for paragraph may include many style,include font,indent,margin,
  * shadow,line height,and so on.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPARASTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPARASTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPARASTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPARASTYLE_HXX
 
 #include <sal/config.h>
 
 #include <rtl/ref.hxx>
 
-#include "xffont.hxx"
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xffont.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfcolor.hxx"
 #include "xfmargins.hxx"
-#include "xfbreaks.hxx"
-#include "xfpadding.hxx"
-#include "xfshadow.hxx"
-#include "xfdropcap.hxx"
-#include "xfstylecont.hxx"
-#include "xflineheight.hxx"
+#include "xfilter/xfbreaks.hxx"
+#include "xfilter/xfpadding.hxx"
+#include "xfilter/xfshadow.hxx"
+#include "xfilter/xfdropcap.hxx"
+#include "xfilter/xfstylecont.hxx"
+#include "xfilter/xflineheight.hxx"
 
 #define     XFPARA_FLAG_FONT        0X00000001
 #define     XFPARA_FLAG_DROPCAP     0X00000002
diff --git a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx b/lotuswordpro/inc/xfilter/xfplaceholder.hxx
index 3e42d903639d..b5e2992d4fc1 100644
--- a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
+++ b/lotuswordpro/inc/xfilter/xfplaceholder.hxx
@@ -57,10 +57,10 @@
  * @file
  * place holder object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPLACEHOLDER_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPLACEHOLDER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPLACEHOLDER_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPLACEHOLDER_HXX
 
-#include "xfcontent.hxx"
+#include "xfilter/xfcontent.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfpoint.hxx b/lotuswordpro/inc/xfilter/xfpoint.hxx
index 0ea6d9090ec6..42ac4474f3b0 100644
--- a/lotuswordpro/source/filter/xfilter/xfpoint.hxx
+++ b/lotuswordpro/inc/xfilter/xfpoint.hxx
@@ -57,8 +57,8 @@
  * @file
  * Represent a point.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPOINT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPOINT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPOINT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPOINT_HXX
 
 class XFPoint
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfrect.hxx b/lotuswordpro/inc/xfilter/xfrect.hxx
index 5c2905969883..7bd89eaf2d52 100644
--- a/lotuswordpro/source/filter/xfilter/xfrect.hxx
+++ b/lotuswordpro/inc/xfilter/xfrect.hxx
@@ -57,10 +57,10 @@
  * @file
  * Rect object
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRECT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRECT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRECT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRECT_HXX
 
-#include "xfpoint.hxx"
+#include "xfilter/xfpoint.hxx"
 
 class XFRect
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.hxx b/lotuswordpro/inc/xfilter/xfrow.hxx
index f413489accf6..01f078e91eb1 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.hxx
+++ b/lotuswordpro/inc/xfilter/xfrow.hxx
@@ -57,10 +57,10 @@
  * @file
  * Table row object. A table is consist by rows.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFROW_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFROW_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFROW_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFROW_HXX
 
-#include "xfcontent.hxx"
+#include "xfilter/xfcontent.hxx"
 #include <rtl/ref.hxx>
 #include <map>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx b/lotuswordpro/inc/xfilter/xfrowstyle.hxx
index facbeb1970f8..b8b20531703e 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfrowstyle.hxx
@@ -57,12 +57,12 @@
  * @file
  * Table row style, ie. table row height.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFROWSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFROWSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFROWSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFROWSTYLE_HXX
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfcolor.hxx"
 
 class XFBGImage;
 class XFRowStyle : public XFStyle
diff --git a/lotuswordpro/source/filter/xfilter/xfruby.hxx b/lotuswordpro/inc/xfilter/xfruby.hxx
index 52f728b4bbc1..fd0e64e45147 100644
--- a/lotuswordpro/source/filter/xfilter/xfruby.hxx
+++ b/lotuswordpro/inc/xfilter/xfruby.hxx
@@ -57,10 +57,10 @@
  * @file
  * ruby text.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRUBY_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRUBY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBY_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBY_HXX
 
-#include "xfcontent.hxx"
+#include "xfilter/xfcontent.hxx"
 
 class XFRubyStart : public XFContent
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx b/lotuswordpro/inc/xfilter/xfrubystyle.hxx
index 228cf0b706ed..e89dbf51c8b3 100644
--- a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfrubystyle.hxx
@@ -57,12 +57,12 @@
  * @file
  * ruby style.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRUBYSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRUBYSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBYSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBYSTYLE_HXX
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
-#include "xfdefs.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfdefs.hxx"
 
 class XFRubyStyle : public XFStyle
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx b/lotuswordpro/inc/xfilter/xfsaxstream.hxx
index fe9e7930f259..25191c463f07 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/inc/xfilter/xfsaxstream.hxx
@@ -57,10 +57,10 @@
  * @file
  * Tool for sax writer.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXSTREAM_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXSTREAM_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSAXSTREAM_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSAXSTREAM_HXX
 
-#include "ixfstream.hxx"
+#include "xfilter/ixfstream.hxx"
 #include <memory>
 
 #include <cppuhelper/factory.hxx>
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/inc/xfilter/xfsection.hxx
index b17b4ae2a513..5c464d27f454 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.hxx
+++ b/lotuswordpro/inc/xfilter/xfsection.hxx
@@ -57,12 +57,12 @@
  * @file
  * Section object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSECTION_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSECTION_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTION_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTION_HXX
 
-#include "xfcontentcontainer.hxx"
-#include "xfcontent.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
+#include "xfilter/xfcontent.hxx"
+#include "xfilter/xfcolor.hxx"
 #include <vector>
 
 /**
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx b/lotuswordpro/inc/xfilter/xfsectionstyle.hxx
index fc7025ae76b5..2f2622f82efd 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfsectionstyle.hxx
@@ -57,13 +57,13 @@
  * @file
  * Section style,whose family is "section"
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSECTIONSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSECTIONSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTIONSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTIONSTYLE_HXX
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
 #include "xfbgimage.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfcolor.hxx"
 #include <memory>
 
 class XFColumns;
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/inc/xfilter/xfshadow.hxx
index 0827fab5cddc..72602488fb9d 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx
+++ b/lotuswordpro/inc/xfilter/xfshadow.hxx
@@ -57,11 +57,11 @@
  * @file
  * Shadow object,now only used by paragraph object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSHADOW_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSHADOW_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSHADOW_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSHADOW_HXX
 
-#include "xfglobal.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcolor.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/inc/xfilter/xfstyle.hxx
index a1ab5623328e..d0a3cb9374f6 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfstyle.hxx
@@ -57,10 +57,10 @@
  * @file
  * Base style object .
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLE_HXX
 
-#include "ixfstyle.hxx"
+#include "xfilter/ixfstyle.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/inc/xfilter/xfstylecont.hxx
index af76510f0d55..5adfe71185b0 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/inc/xfilter/xfstylecont.hxx
@@ -57,10 +57,10 @@
  * @file
  * Style container,which response for special style,ie. text style.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLECONT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLECONT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLECONT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLECONT_HXX
 
-#include "xfglobal.hxx"
+#include "xfilter/xfglobal.hxx"
 #include <vector>
 
 class IXFStyle;
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx b/lotuswordpro/inc/xfilter/xfstylemanager.hxx
index 9a13b472d14e..f9bb8fac0371 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx
+++ b/lotuswordpro/inc/xfilter/xfstylemanager.hxx
@@ -57,13 +57,13 @@
  * @file
  * Style manager for the filter.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLEMANAGER_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLEMANAGER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLEMANAGER_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLEMANAGER_HXX
 
 #include "xfglobal.hxx"
-#include "xffontdecl.hxx"
-#include "xfstylecont.hxx"
-#include "xfconfigmanager.hxx"
+#include "xfilter/xffontdecl.hxx"
+#include "xfilter/xfstylecont.hxx"
+#include "xfilter/xfconfigmanager.hxx"
 #include <map>
 #include <vector>
 
diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/inc/xfilter/xftable.hxx
index 8340c12724e3..6e650cbef4c6 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.hxx
+++ b/lotuswordpro/inc/xfilter/xftable.hxx
@@ -57,13 +57,13 @@
  * @file
  * Table object.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABLE_HXX
 
-#include "xfcontent.hxx"
+#include "xfilter/xfcontent.hxx"
 #include "xfrow.hxx"
 #include "xfcell.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 #include <map>
 #include <vector>
 
diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx b/lotuswordpro/inc/xfilter/xftablestyle.hxx
index f7510382d17f..62f6bcdf57b8 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftablestyle.hxx
@@ -57,14 +57,14 @@
  * @file
  * Table style.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABLESTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABLESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABLESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABLESTYLE_HXX
 
-#include "xfstyle.hxx"
+#include "xfilter/xfstyle.hxx"
 #include "xfmargins.hxx"
-#include "xfshadow.hxx"
-#include "xfcolor.hxx"
-#include "xfbreaks.hxx"
+#include "xfilter/xfshadow.hxx"
+#include "xfilter/xfcolor.hxx"
+#include "xfilter/xfbreaks.hxx"
 #include <memory>
 
 class XFBGImage;
diff --git a/lotuswordpro/source/filter/xfilter/xftabstop.hxx b/lotuswordpro/inc/xfilter/xftabstop.hxx
index 25003f9b4db3..2b569d48e681 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstop.hxx
+++ b/lotuswordpro/inc/xfilter/xftabstop.hxx
@@ -57,11 +57,11 @@
  * @file
  * Tab stop object,<text:tab-stop/>
  *************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABSTOP_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABSTOP_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABSTOP_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABSTOP_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
 
 class XFTabStop : public XFContent
 {
diff --git a/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx b/lotuswordpro/inc/xfilter/xftextboxstyle.hxx
index 0b27d0847045..a185428b3cc4 100644
--- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftextboxstyle.hxx
@@ -53,14 +53,14 @@
  *
  *
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTBOXSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTBOXSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTBOXSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTBOXSTYLE_HXX
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
 #include "xfmargins.hxx"
-#include "xfcolor.hxx"
-#include "xfpadding.hxx"
+#include "xfilter/xfcolor.hxx"
+#include "xfilter/xfpadding.hxx"
 
 /**
 * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx b/lotuswordpro/inc/xfilter/xftextcontent.hxx
index 7c185fc2b9bb..5995e43b074c 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
+++ b/lotuswordpro/inc/xfilter/xftextcontent.hxx
@@ -54,11 +54,11 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTCONTENT_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTCONTENT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTCONTENT_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTCONTENT_HXX
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
 
 class IXFStream;
 
diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.hxx b/lotuswordpro/inc/xfilter/xftextspan.hxx
index 17e033ceb1cb..7596c6cc148d 100644
--- a/lotuswordpro/source/filter/xfilter/xftextspan.hxx
+++ b/lotuswordpro/inc/xfilter/xftextspan.hxx
@@ -57,8 +57,8 @@
  * @file
  * An span of text with style.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTSPAN_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTSPAN_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTSPAN_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTSPAN_HXX
 
 #include <sal/config.h>
 
@@ -66,8 +66,8 @@
 
 #include <rtl/ref.hxx>
 
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfcontent.hxx"
 
 class IXFStream;
 
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx b/lotuswordpro/inc/xfilter/xftextstyle.hxx
index 282550e8f4d2..9dbfd99cec28 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftextstyle.hxx
@@ -58,15 +58,15 @@
  * Style for <text:p> or <text:h> or <text:span>
  * Now we have only font attributes.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTSTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTSTYLE_HXX
 
 #include <sal/config.h>
 
 #include <rtl/ref.hxx>
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
 
 class   IXFStream;
 class   XFFont;
diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx b/lotuswordpro/inc/xfilter/xftimestyle.hxx
index 72609cf4fe62..cc3ece2f5858 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftimestyle.hxx
@@ -57,11 +57,11 @@
  * @file
  * Time style. The TIme format for time field.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTIMESTYLE_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTIMESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTIMESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTIMESTYLE_HXX
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
 #include <vector>
 
 class XFDateTimePart : public XFStyle
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/inc/xfilter/xfutil.hxx
index c9eddad4f3ba..076a35ac2c3f 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.hxx
+++ b/lotuswordpro/inc/xfilter/xfutil.hxx
@@ -58,10 +58,10 @@
  * Tool functions for xml filter.
  * Don't use any template for the ***TOOUString function list for easy.
  ************************************************************************/
-#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFUTIL_HXX
-#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFUTIL_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFUTIL_HXX
+#define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFUTIL_HXX
 
-#include "xfdefs.hxx"
+#include "xfilter/xfdefs.hxx"
 #include <rtl/ustring.hxx>
 #include <string>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.hxx b/lotuswordpro/source/filter/xfilter/xfbase64.hxx
index 7e2ba54bb39d..9ee6a81b9004 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 "xfglobal.hxx"
+#include "xfilter/xfglobal.hxx"
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
index a50d83353afb..0aea0fc2bb8f 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
@@ -57,7 +57,7 @@
  * @file
  * Background image.
  ************************************************************************/
-#include "xfbgimage.hxx"
+#include "xfilter/xfbgimage.hxx"
 #include "xfbase64.hxx"
 
 XFBGImage::XFBGImage()
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx
index 695914482b05..2a5c1aab6287 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx
@@ -57,7 +57,7 @@
  * @file
  * Border object,now only used by paragraph object.
  ************************************************************************/
-#include "xfborders.hxx"
+#include "xfilter/xfborders.hxx"
 
 XFBorder::XFBorder()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index c3552eec646d..52f06b571f49 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -57,13 +57,13 @@
  * @file
  * Table cell.
  ************************************************************************/
-#include "xfcell.hxx"
+#include "xfilter/xfcell.hxx"
 
 #include <stdexcept>
 
-#include "xfparagraph.hxx"
-#include "xftable.hxx"
-#include "xfrow.hxx"
+#include "xfilter/xfparagraph.hxx"
+#include "xfilter/xftable.hxx"
+#include "xfilter/xfrow.hxx"
 
 XFCell::XFCell()
     : m_pOwnerRow(nullptr)
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
index 4f5c6b217c53..d665798578d6 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
@@ -57,10 +57,10 @@
  * @file
  * Table cell style. Number format, string value, and so on...
  ************************************************************************/
-#include "xfcellstyle.hxx"
-#include "xfborders.hxx"
-#include "xffont.hxx"
-#include "xfbgimage.hxx"
+#include "xfilter/xfcellstyle.hxx"
+#include "xfilter/xfborders.hxx"
+#include "xfilter/xffont.hxx"
+#include "xfilter/xfbgimage.hxx"
 
 XFCellStyle::XFCellStyle()
     : m_eHoriAlign(enumXFAlignNone)
diff --git a/lotuswordpro/source/filter/xfilter/xfchange.cxx b/lotuswordpro/source/filter/xfilter/xfchange.cxx
index 5a76235ebc69..825ae0880850 100644
--- a/lotuswordpro/source/filter/xfilter/xfchange.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfchange.cxx
@@ -58,7 +58,7 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "xfchange.hxx"
+#include "xfilter/xfchange.hxx"
 
 void XFChangeList::ToXml(IXFStream *pStrm)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.cxx b/lotuswordpro/source/filter/xfilter/xfcolor.cxx
index d4adff73e78b..2979f871cea1 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolor.cxx
@@ -59,7 +59,7 @@
  ************************************************************************/
 #include <string.h>
 #include <stdio.h>
-#include "xfcolor.hxx"
+#include "xfilter/xfcolor.hxx"
 
 OUString XFColor::ToString() const
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
index 9cddf25bbeff..e13e3cb2bfc3 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
@@ -57,7 +57,7 @@
  * @file
  * Column style object.
  ************************************************************************/
-#include "xfcolstyle.hxx"
+#include "xfilter/xfcolstyle.hxx"
 
 XFColStyle::XFColStyle()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
index 48d8367f018e..2c0a10c67424 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
@@ -57,7 +57,7 @@
  * @file
  * Columns styles for section, or paragraph.
  ************************************************************************/
-#include "xfcolumns.hxx"
+#include "xfilter/xfcolumns.hxx"
 
 void    XFColumn::SetRelWidth(sal_Int32 width)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx
index 87e146bd1107..a6bc652ba21f 100644
--- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx
@@ -57,7 +57,7 @@
  * @file
  * Manager for all config object,include line number config.
  ************************************************************************/
-#include "xfconfigmanager.hxx"
+#include "xfilter/xfconfigmanager.hxx"
 
 XFConfigManager::XFConfigManager()
     : m_pLineNumberConfig(nullptr)
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
index e2b1f58bdfa4..b3ddd305e4d2 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
@@ -57,8 +57,8 @@
  * @file
  * Container for content.It will destroy all children when destroy.
  ************************************************************************/
-#include "xfcontentcontainer.hxx"
-#include "xftextcontent.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
+#include "xfilter/xftextcontent.hxx"
 
 XFContentContainer::XFContentContainer()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfcrossref.cxx b/lotuswordpro/source/filter/xfilter/xfcrossref.cxx
index 0315b295b1fa..15801c7a950b 100644
--- a/lotuswordpro/source/filter/xfilter/xfcrossref.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcrossref.cxx
@@ -60,9 +60,9 @@
 
 #include <sal/config.h>
 
-#include "ixfattrlist.hxx"
-#include "ixfstream.hxx"
-#include "xfcrossref.hxx"
+#include "xfilter/ixfattrlist.hxx"
+#include "xfilter/ixfstream.hxx"
+#include "xfilter/xfcrossref.hxx"
 
 XFCrossRefStart::XFCrossRefStart()
     : m_nType(CROSSREF_INVALID)
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.cxx b/lotuswordpro/source/filter/xfilter/xfdate.cxx
index 791c3c805367..649bbf43f8c5 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.cxx
@@ -58,7 +58,7 @@
  * Date field with date style.
  ************************************************************************/
 #include <string.h>
-#include "xfdate.hxx"
+#include "xfilter/xfdate.hxx"
 
 XFDate::XFDate()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx
index 27df1203831c..465dadf12225 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.cxx
@@ -57,7 +57,7 @@
  * @file
  * Date style. The date format for date field.
  ************************************************************************/
-#include "xfdatestyle.hxx"
+#include "xfilter/xfdatestyle.hxx"
 
 XFDatePart::XFDatePart()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
index 0f20aa19bfb5..3b3e04c606da 100644
--- a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
@@ -57,7 +57,7 @@
  * @file
  * doc field.
  ************************************************************************/
-#include "xfdocfield.hxx"
+#include "xfilter/xfdocfield.hxx"
 
 void XFFileName::SetType(const OUString& sType)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
index 4870aab710e4..bf31def5ab1c 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
@@ -61,8 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWAREASTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWAREASTYLE_HXX
 
-#include "xfstyle.hxx"
-#include "xfcolor.hxx"
+#include "xfilter/xfstyle.hxx"
+#include "xfilter/xfcolor.hxx"
 
 class XFDrawAreaStyle : public XFStyle
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
index 4fb6473d4b0c..76ff3732f00a 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
@@ -57,7 +57,7 @@
  * @file
  * Line object.
  ************************************************************************/
-#include "xfdrawline.hxx"
+#include "xfilter/xfdrawline.hxx"
 
 XFDrawLine::XFDrawLine()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx
index dfee4d19714c..583fdee63fc3 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx
@@ -57,7 +57,7 @@
  * @file
  * Line style of Drawing object.
  ************************************************************************/
-#include "xfdrawlinestyle.hxx"
+#include "xfilter/xfdrawlinestyle.hxx"
 
 XFDrawLineStyle::XFDrawLineStyle()
     : m_eLineStyle(enumXFLineSolid)
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
index 32a20e92905c..1d982149ee86 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
@@ -57,7 +57,7 @@
  * @file
  * Interfer for all Drawing object.
  ************************************************************************/
-#include "xfdrawobj.hxx"
+#include "xfilter/xfdrawobj.hxx"
 
 XFDrawObject::XFDrawObject()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
index 52c8ac011765..fe37469242e3 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -57,7 +57,7 @@
  * @file
  * Draw path object.
  ************************************************************************/
-#include "xfdrawpath.hxx"
+#include "xfilter/xfdrawpath.hxx"
 
 XFSvgPathEntry::XFSvgPathEntry()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
index 281fb31f866d..ef29d81c2684 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
@@ -57,7 +57,7 @@
  * @file
  * Polygon object.
  */
-#include "xfdrawpolygon.hxx"
+#include "xfilter/xfdrawpolygon.hxx"
 
 XFDrawPolygon::XFDrawPolygon()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
index 5c8e05e8426b..31c17e81162f 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
@@ -57,7 +57,7 @@
  * @file
  * Polyline.
  ************************************************************************/
-#include "xfdrawpolyline.hxx"
+#include "xfilter/xfdrawpolyline.hxx"
 
 XFDrawPolyline::XFDrawPolyline()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx b/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
index 05a3bf13f52c..edf45b01fcce 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
@@ -57,7 +57,7 @@
  * @file
  * Rect object.
  ************************************************************************/
-#include "xfdrawrect.hxx"
+#include "xfilter/xfdrawrect.hxx"
 
 XFDrawRect::XFDrawRect()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
index cb1e9d7746ca..f633063cfc62 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
@@ -57,12 +57,12 @@
  * @file
  * Style for all draw object.
  ************************************************************************/
-#include "xfdrawstyle.hxx"
-#include "xfdrawlinestyle.hxx"
+#include "xfilter/xfdrawstyle.hxx"
+#include "xfilter/xfdrawlinestyle.hxx"
 #include "xfdrawareastyle.hxx"
-#include "xfstylemanager.hxx"
+#include "xfilter/xfstylemanager.hxx"
 #include "xffontworkstyle.hxx"
-#include "../lwpglobalmgr.hxx"
+#include "lwpglobalmgr.hxx"
 XFDrawStyle::XFDrawStyle()
     : m_pFontWorkStyle(nullptr)
     , m_eWrap(enumXFWrapNone)
diff --git a/lotuswordpro/source/filter/xfilter/xfentry.cxx b/lotuswordpro/source/filter/xfilter/xfentry.cxx
index c4784e6a5bdc..c6d3497aaf5b 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfentry.cxx
@@ -60,9 +60,9 @@
 
 #include <sal/config.h>
 
-#include "ixfattrlist.hxx"
-#include "ixfstream.hxx"
-#include "xfentry.hxx"
+#include "xfilter/ixfattrlist.hxx"
+#include "xfilter/ixfstream.hxx"
+#include "xfilter/xfentry.hxx"
 
 XFEntry::XFEntry()
     : m_eType(enumXFEntryTOC)
diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
index 031b963ac953..9c7384ad8752 100644
--- a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
@@ -57,7 +57,7 @@
  * @file
  * Float frame whose anchor is page.
  ************************************************************************/
-#include "xffloatframe.hxx"
+#include "xfilter/xffloatframe.hxx"
 
 XFFloatFrame::XFFloatFrame(sal_Int32 start, sal_Int32 end, bool all)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xffont.cxx b/lotuswordpro/source/filter/xfilter/xffont.cxx
index e8073bfd1aa9..a5c2a7e42b57 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.cxx
@@ -57,7 +57,7 @@
  * @file
  * Font object to serial to xml filter.
  ************************************************************************/
-#include "xffont.hxx"
+#include "xfilter/xffont.hxx"
 
 XFFont::XFFont()
     : m_nFontSize(0)
diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
index 64da24e1500a..9b074e43d9c3 100644
--- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
@@ -57,7 +57,7 @@
  * @file
  * Font decl of all used fonts.
  ************************************************************************/
-#include "xffontdecl.hxx"
+#include "xfilter/xffontdecl.hxx"
 
 XFFontDecl::XFFontDecl(const OUString& name, const OUString& family)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
index 3cf282e98c74..53e6565aac84 100644
--- a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
@@ -57,7 +57,7 @@
  * @file
  * Implement for font factory which will manage all font.
  ************************************************************************/
-#include "xffontfactory.hxx"
+#include "xfilter/xffontfactory.hxx"
 
 XFFontFactory::XFFontFactory()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
index 5ad4be6c214f..58ac1b57e55d 100644
--- a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX
 
-#include "xfstyle.hxx"
+#include "xfilter/xfstyle.hxx"
 
 class XFFontWorkStyle
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx
index d34f56f484c3..5bcb20761780 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx
@@ -57,8 +57,8 @@
  * @file
  * Frame whose anchor is not page.
  ************************************************************************/
-#include "xfframe.hxx"
-#include "xfparagraph.hxx"
+#include "xfilter/xfframe.hxx"
+#include "xfilter/xfparagraph.hxx"
 #define     ZINDEX_MIN 0
 
 XFFrame::XFFrame()
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
index 82de4fbea14e..ce0c8297f57d 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
@@ -57,11 +57,11 @@
  * @file
  * Frame style include position,size,rotation and so on.
  ************************************************************************/
-#include "xfframestyle.hxx"
-#include "xfcolumns.hxx"
-#include "xfborders.hxx"
-#include "xfshadow.hxx"
-#include "xfbgimage.hxx"
+#include "xfilter/xfframestyle.hxx"
+#include "xfilter/xfcolumns.hxx"
+#include "xfilter/xfborders.hxx"
+#include "xfilter/xfshadow.hxx"
+#include "xfilter/xfbgimage.hxx"
 
 XFFrameStyle::XFFrameStyle()
     : m_eWrap(enumXFWrapNone)
diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.cxx b/lotuswordpro/source/filter/xfilter/xfglobal.cxx
index dd0eca8e17ff..8e676bb5ba4f 100644
--- a/lotuswordpro/source/filter/xfilter/xfglobal.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfglobal.cxx
@@ -58,9 +58,9 @@
  * Global functions or include files that are needed.
  * It's all for the full filter.
  ************************************************************************/
-#include "xfglobal.hxx"
-#include "xffontfactory.hxx"
-#include "xfstylemanager.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xffontfactory.hxx"
+#include "xfilter/xfstylemanager.hxx"
 
 int XFGlobal::s_nFrameID = 1;
 int XFGlobal::s_nGraphID = 1;
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
index 4722ca168c43..c1bbba40668c 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
@@ -57,8 +57,8 @@
  * @file
  * Header style,exist in page-master object.
  ************************************************************************/
-#include "xfheaderstyle.hxx"
-#include "xfbgimage.hxx"
+#include "xfilter/xfheaderstyle.hxx"
+#include "xfilter/xfbgimage.hxx"
 
 XFHeaderStyle::XFHeaderStyle(bool isFooter)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx b/lotuswordpro/source/filter/xfilter/xfimage.cxx
index b8ae90fbe48e..09f0ec10b47a 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx
@@ -57,7 +57,7 @@
  * @file
  * Image object.
  ************************************************************************/
-#include "xfimage.hxx"
+#include "xfilter/xfimage.hxx"
 #include "xfbase64.hxx"
 
 XFImage::XFImage() : m_bUseLink(false)
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
index bf1810f00818..f9f1d55c5ede 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
@@ -57,9 +57,9 @@
  * @file
  * Image style object.
  ************************************************************************/
-#include "xfimagestyle.hxx"
-#include "xfborders.hxx"
-#include "xfshadow.hxx"
+#include "xfilter/xfimagestyle.hxx"
+#include "xfilter/xfborders.hxx"
+#include "xfilter/xfshadow.hxx"
 
 XFImageStyle::XFImageStyle()
     : m_nBrightness(0)
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index ebde5543f910..14ec1417535a 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -57,8 +57,8 @@
  * @file
  * Represente index source,index body and index index entry.
  ************************************************************************/
-#include "xfindex.hxx"
-#include "xfparagraph.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 7a270edafcec..33d620a25da4 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.cxx
@@ -57,10 +57,10 @@
  * @file
  * List object.
  ************************************************************************/
-#include "xflist.hxx"
-#include "xflistitem.hxx"
-#include "ixfstream.hxx"
-#include "ixfattrlist.hxx"
+#include "xfilter/xflist.hxx"
+#include "xfilter/xflistitem.hxx"
+#include "xfilter/ixfstream.hxx"
+#include "xfilter/ixfattrlist.hxx"
 
 XFList::XFList()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
index ff37257a3c3e..78463a943c56 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
@@ -57,7 +57,7 @@
  * @file
  * Styles for ordered list and unordered list.
  ************************************************************************/
-#include "xfliststyle.hxx"
+#include "xfilter/xfliststyle.hxx"
 
 XFListLevel::XFListLevel()
     : m_nLevel(0)
diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.cxx b/lotuswordpro/source/filter/xfilter/xfmargins.cxx
index df930b3ef052..63fb3e298623 100644
--- a/lotuswordpro/source/filter/xfilter/xfmargins.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmargins.cxx
@@ -58,7 +58,7 @@
  * Margins object, include left margin,right margin,top margin and bottom margin.
  ************************************************************************/
 
-#include "xfmargins.hxx"
+#include "xfilter/xfmargins.hxx"
 
 XFMargins::XFMargins()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
index 34ff89b33adc..f015a3516c96 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
@@ -57,12 +57,12 @@
  * @file
  * Master page object which was used to apply a layout to the pages.
  ************************************************************************/
-#include "xfmasterpage.hxx"
-#include "xfpagemaster.hxx"
-#include "xfstylemanager.hxx"
-#include "xffooter.hxx"
-#include "xfheader.hxx"
-#include "../lwpglobalmgr.hxx"
+#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/xfnumberstyle.cxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
index 6eb25956f5f6..77dbd1144fae 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
@@ -57,7 +57,7 @@
  * @file
  * Number style for table cell.
  ************************************************************************/
-#include "xfnumberstyle.hxx"
+#include "xfilter/xfnumberstyle.hxx"
 
 XFNumberStyle::XFNumberStyle()
     : m_eType(enumXFNumberNumber)
diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
index d20080267b30..95aaadf448e3 100644
--- a/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
@@ -57,9 +57,9 @@
  * @file
  * Implementation file for Meta data,pls reference to the header file.
  ************************************************************************/
-#include "xfofficemeta.hxx"
-#include "ixfstream.hxx"
-#include "ixfattrlist.hxx"
+#include "xfilter/xfofficemeta.hxx"
+#include "xfilter/ixfstream.hxx"
+#include "xfilter/ixfattrlist.hxx"
 
 void    XFOfficeMeta::SetCreator(const OUString& creator)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
index 90d5009680b6..8a645771c556 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
@@ -58,15 +58,15 @@
  * Page master used bye XFMasterPage.
  * It is the real object to define header and footer of pages.
  ************************************************************************/
-#include "xfpagemaster.hxx"
-#include "ixfstream.hxx"
-#include "ixfattrlist.hxx"
-#include "xfborders.hxx"
-#include "xfshadow.hxx"
-#include "xfcolumns.hxx"
-#include "xfheaderstyle.hxx"
-#include "xffooterstyle.hxx"
-#include "xfbgimage.hxx"
+#include "xfilter/xfpagemaster.hxx"
+#include "xfilter/ixfstream.hxx"
+#include "xfilter/ixfattrlist.hxx"
+#include "xfilter/xfborders.hxx"
+#include "xfilter/xfshadow.hxx"
+#include "xfilter/xfcolumns.hxx"
+#include "xfilter/xfheaderstyle.hxx"
+#include "xfilter/xffooterstyle.hxx"
+#include "xfilter/xfbgimage.hxx"
 
 XFPageMaster::XFPageMaster() : m_fPageWidth(0), m_fPageHeight(0), m_eUsage(enumXFPageUsageNone),
 m_eTextDir(enumXFTextDirNone), m_pBorders(nullptr), m_pShadow(nullptr),
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
index cc2856a40ab7..b5e8a17d2876 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
@@ -57,10 +57,10 @@
  * @file
  * Paragraph object of OOo, it will output <text:p >...</text:p> element.
  ************************************************************************/
-#include "xfparagraph.hxx"
-#include "ixfstream.hxx"
-#include "ixfattrlist.hxx"
-#include "xftextcontent.hxx"
+#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/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index 14f07aac964a..106cd707b4e9 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -59,11 +59,11 @@
  * Styles for paragraph may include many style,include font,indent,margin,
  * shadow,line height,and so on.
  ************************************************************************/
-#include "xfparastyle.hxx"
-#include "xffont.hxx"
-#include "xfborders.hxx"
+#include "xfilter/xfparastyle.hxx"
+#include "xfilter/xffont.hxx"
+#include "xfilter/xfborders.hxx"
 #include "xftabstyle.hxx"
-#include "xfbgimage.hxx"
+#include "xfilter/xfbgimage.hxx"
 
 XFParaStyle::XFParaStyle()
     : m_eAlignType(enumXFAlignNone)
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.cxx b/lotuswordpro/source/filter/xfilter/xfrow.cxx
index 3490c76ddbe1..c87c3c96cec5 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.cxx
@@ -60,11 +60,11 @@
 
 #include <sal/config.h>
 
-#include "ixfattrlist.hxx"
-#include "ixfstream.hxx"
-#include "xfrow.hxx"
-#include "xfcell.hxx"
-#include "xftable.hxx"
+#include "xfilter/ixfattrlist.hxx"
+#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 d2aba0a8e4a4..8a5a00e55f42 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
@@ -57,8 +57,8 @@
  * @file
  * Table row style, ie. table row height.
  ************************************************************************/
-#include "xfrowstyle.hxx"
-#include "xfbgimage.hxx"
+#include "xfilter/xfrowstyle.hxx"
+#include "xfilter/xfbgimage.hxx"
 
 XFRowStyle::XFRowStyle():m_fHeight(0)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
index 35280b9a2ccd..a56c85ee436c 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXATTRLIST_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXATTRLIST_HXX
 
-#include "ixfattrlist.hxx"
+#include "xfilter/ixfattrlist.hxx"
 #include <rtl/ref.hxx>
 #include <xmloff/attrlist.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
index dfffa84fefa8..8963495eaf70 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
@@ -57,7 +57,7 @@
  * @file
  * Tool for sax writer.
  ************************************************************************/
-#include "xfsaxstream.hxx"
+#include "xfilter/xfsaxstream.hxx"
 #include "xfsaxattrlist.hxx"
 
 #include <cppuhelper/factory.hxx>
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx
index 5079fe7936ea..d87858efa53e 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx
@@ -57,7 +57,7 @@
  * @file
  * Section object.
  ************************************************************************/
-#include "xfsection.hxx"
+#include "xfilter/xfsection.hxx"
 
 XFSection::XFSection()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
index 43aada97b19b..ded41d53298b 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
@@ -57,8 +57,8 @@
  * @file
  * Section style,whose family is "section"
  ************************************************************************/
-#include "xfsectionstyle.hxx"
-#include "xfcolumns.hxx"
+#include "xfilter/xfsectionstyle.hxx"
+#include "xfilter/xfcolumns.hxx"
 
 XFSectionStyle::XFSectionStyle()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
index b399e34ec882..00d601c82f82 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
@@ -57,7 +57,7 @@
  * @file
  * Shadow object,now only used by paragraph object.
  ************************************************************************/
-#include "xfshadow.hxx"
+#include "xfilter/xfshadow.hxx"
 
 XFShadow::XFShadow()
     : m_ePosition(enumXFShadowNone)
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.cxx b/lotuswordpro/source/filter/xfilter/xfstyle.cxx
index eb25502ab7ad..e606b9a22459 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.cxx
@@ -57,7 +57,7 @@
  * @file
  * Base style object .
  ************************************************************************/
-#include "xfstyle.hxx"
+#include "xfilter/xfstyle.hxx"
 
 XFStyle::XFStyle()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
index 35ec19c7046b..7ed604deb0a1 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
@@ -57,13 +57,13 @@
  * @file
  * Font object to serial to xml filter.
  ************************************************************************/
-#include "xfstylecont.hxx"
-#include "ixfstyle.hxx"
-#include "xffont.hxx"
-#include "xftextstyle.hxx"
-#include "xfparastyle.hxx"
-#include "xffontfactory.hxx"
-#include "../lwpglobalmgr.hxx"
+#include "xfilter/xfstylecont.hxx"
+#include "xfilter/ixfstyle.hxx"
+#include "xfilter/xffont.hxx"
+#include "xfilter/xftextstyle.hxx"
+#include "xfilter/xfparastyle.hxx"
+#include "xfilter/xffontfactory.hxx"
+#include "lwpglobalmgr.hxx"
 
 XFStyleContainer::XFStyleContainer(const OUString& strStyleNamePrefix)
     :m_strStyleNamePrefix(strStyleNamePrefix)
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
index ac439d25872d..31d54639b62a 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
@@ -60,10 +60,10 @@
 
 #include <sal/config.h>
 
-#include <xfparastyle.hxx>
-#include "xfstylemanager.hxx"
-#include <xftextstyle.hxx>
-#include "ixfstyle.hxx"
+#include <xfilter/xfparastyle.hxx>
+#include "xfilter/xfstylemanager.hxx"
+#include <xfilter/xftextstyle.hxx>
+#include "xfilter/ixfstyle.hxx"
 
 XFStyleManager::XFStyleManager() : s_aStdArrowStyles( "arrow" ), s_aTextStyles( "T" ),
     s_aParaStyles( "P" ),s_aListStyles( "L" ),s_aSectionStyles( "Sect" ),
diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 2125eb9d7ac8..a693171386b0 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -57,10 +57,10 @@
  * @file
  * Table object.
  ************************************************************************/
-#include "xftable.hxx"
-#include "xfrow.hxx"
-#include "xfcolstyle.hxx"
-#include "xfstylemanager.hxx"
+#include "xfilter/xftable.hxx"
+#include "xfilter/xfrow.hxx"
+#include "xfilter/xfcolstyle.hxx"
+#include "xfilter/xfstylemanager.hxx"
 #include <cassert>
 
 XFTable::XFTable()
diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
index 0a4ae26c65c7..fff8de5c4e6a 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
@@ -57,8 +57,8 @@
  * @file
  * Table style.
  ************************************************************************/
-#include "xftablestyle.hxx"
-#include "xfbgimage.hxx"
+#include "xfilter/xftablestyle.hxx"
+#include "xfilter/xfbgimage.hxx"
 
 XFTableStyle::XFTableStyle()
     : m_fWidth(2)
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
index 69b9e6dcf4ae..c960bc79a993 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABSTYLE_HXX
 
-#include "xfglobal.hxx"
-#include "xfstyle.hxx"
+#include "xfilter/xfglobal.hxx"
+#include "xfilter/xfstyle.hxx"
 #include <vector>
 
 class XFTabStyle : public XFStyle
diff --git a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
index bbd89480c13a..014aa6a001c2 100644
--- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
@@ -53,11 +53,11 @@
  *
  *
  ************************************************************************/
-#include "xftextboxstyle.hxx"
-#include "xfcolumns.hxx"
-#include "xfborders.hxx"
-#include "xfshadow.hxx"
-#include "xfbgimage.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/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
index 61a1dccff68a..e18e03fe824d 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
@@ -54,8 +54,8 @@
  *
  ************************************************************************/
 
-#include "xftextcontent.hxx"
-#include "ixfstream.hxx"
+#include "xfilter/xftextcontent.hxx"
+#include "xfilter/ixfstream.hxx"
 
 XFTextContent::XFTextContent(const OUString& text):m_strText(text)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.cxx b/lotuswordpro/source/filter/xfilter/xftextspan.cxx
index 05427d6dde6d..d43d601650f4 100644
--- a/lotuswordpro/source/filter/xfilter/xftextspan.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextspan.cxx
@@ -57,10 +57,10 @@
  * @file
  * An span of text with style.
  ************************************************************************/
-#include "xftextspan.hxx"
-#include "ixfstream.hxx"
-#include "ixfattrlist.hxx"
-#include "xftextcontent.hxx"
+#include "xfilter/xftextspan.hxx"
+#include "xfilter/ixfstream.hxx"
+#include "xfilter/ixfattrlist.hxx"
+#include "xfilter/xftextcontent.hxx"
 
 XFTextSpan::XFTextSpan()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
index 644a3226e645..1f91dca93bdf 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
@@ -58,11 +58,11 @@
  * Style for <text:p> or <text:h> or <text:span>
  * Now we have only font attributes.
  ************************************************************************/
-#include "xftextstyle.hxx"
-#include "ixfattrlist.hxx"
-#include "ixfstream.hxx"
-#include "xffont.hxx"
-#include "xfutil.hxx"
+#include "xfilter/xftextstyle.hxx"
+#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/xftimestyle.cxx b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
index d36266ec01fb..4b1758f9a0aa 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
@@ -58,7 +58,7 @@
  * Time style. The Time format for time field.
  ************************************************************************/
 
-#include "xftimestyle.hxx"
+#include "xfilter/xftimestyle.hxx"
 
 XFTimePart::XFTimePart()
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index f438133dcc81..50b4bd1a6053 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -57,9 +57,9 @@
  * @file
  * Util functions for xml filter.
  ************************************************************************/
-#include "xfutil.hxx"
-#include "xfparagraph.hxx"
-#include "xfcontentcontainer.hxx"
+#include "xfilter/xfutil.hxx"
+#include "xfilter/xfparagraph.hxx"
+#include "xfilter/xfcontentcontainer.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <sstream>
author	Stephan Bergmann <sbergman@redhat.com>	2017-10-17 12:38:40 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2017-10-17 14:29:11 +0200
commit	4e9ebc6de44b22418f26fb6d931bedcc5d936906 (patch)
tree	fb0f9a2290d398ca33af6d8276d4827423122833 /lotuswordpro
parent	d6831a8a34257789a920491747e12ebe62f927fe (diff)