loplugin:includeform: lotuswordpro

Change-Id: I1ff35dd6242accf0a8e71086a14a72e85eef1c5a
author: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:37:31 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:46:02 +0200
commit: e6ecc6e428a49c725484547dfa4454bab3aba882 (patch)
tree: 3e857cd74783ede2ee80b726298d9a64f5d91494 /lotuswordpro
parent: 60de56cf1ae694fd86a2ce20711cf97958228656 (diff)
289 files changed, 844 insertions, 844 deletions
diff --git a/lotuswordpro/inc/xfilter/ixfstyle.hxx b/lotuswordpro/inc/xfilter/ixfstyle.hxx
index 16c3abd4d21e..322e0b6b440e 100644
--- a/lotuswordpro/inc/xfilter/ixfstyle.hxx
+++ b/lotuswordpro/inc/xfilter/ixfstyle.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_IXFSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_IXFSTYLE_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 /**
  * @descr
  * Interface for all style object.
diff --git a/lotuswordpro/inc/xfilter/xfannotation.hxx b/lotuswordpro/inc/xfilter/xfannotation.hxx
index c0040a554216..9821d8243a21 100644
--- a/lotuswordpro/inc/xfilter/xfannotation.hxx
+++ b/lotuswordpro/inc/xfilter/xfannotation.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFANNOTATION_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFANNOTATION_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
 
 class XFAnnotation : public XFContentContainer
 {
diff --git a/lotuswordpro/inc/xfilter/xfarrowstyle.hxx b/lotuswordpro/inc/xfilter/xfarrowstyle.hxx
index 76c72318b827..a1f622b32549 100644
--- a/lotuswordpro/inc/xfilter/xfarrowstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfarrowstyle.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFARROWSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFARROWSTYLE_HXX
 
-#include "xfilter/xfstyle.hxx"
+#include <xfilter/xfstyle.hxx>
 
 class XFArrowStyle : public XFStyle
 {
diff --git a/lotuswordpro/inc/xfilter/xfbgimage.hxx b/lotuswordpro/inc/xfilter/xfbgimage.hxx
index 1622c12ced02..8f2e75208fbb 100644
--- a/lotuswordpro/inc/xfilter/xfbgimage.hxx
+++ b/lotuswordpro/inc/xfilter/xfbgimage.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBGIMAGE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBGIMAGE_HXX
 
-#include "xfilter/xfstyle.hxx"
+#include <xfilter/xfstyle.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfbookmark.hxx b/lotuswordpro/inc/xfilter/xfbookmark.hxx
index a03869bf3686..2c2a684f2bd9 100644
--- a/lotuswordpro/inc/xfilter/xfbookmark.hxx
+++ b/lotuswordpro/inc/xfilter/xfbookmark.hxx
@@ -62,9 +62,9 @@
 
 #include <sal/config.h>
 
-#include "xfilter/ixfattrlist.hxx"
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/ixfattrlist.hxx>
+#include <xfilter/ixfstream.hxx>
+#include <xfilter/xfcontent.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfborders.hxx b/lotuswordpro/inc/xfilter/xfborders.hxx
index e46b11c0c879..b9da6a4abe9f 100644
--- a/lotuswordpro/inc/xfilter/xfborders.hxx
+++ b/lotuswordpro/inc/xfilter/xfborders.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBORDERS_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBORDERS_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcolor.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcolor.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfbreaks.hxx b/lotuswordpro/inc/xfilter/xfbreaks.hxx
index f8b078c4d7b8..a5a1bc443a5b 100644
--- a/lotuswordpro/inc/xfilter/xfbreaks.hxx
+++ b/lotuswordpro/inc/xfilter/xfbreaks.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBREAKS_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFBREAKS_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 
 /**
  * @descr   Page|Column break object.
diff --git a/lotuswordpro/inc/xfilter/xfcell.hxx b/lotuswordpro/inc/xfilter/xfcell.hxx
index 04bfadb782d9..9199b5a1aba1 100644
--- a/lotuswordpro/inc/xfilter/xfcell.hxx
+++ b/lotuswordpro/inc/xfilter/xfcell.hxx
@@ -61,8 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCELL_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCELL_HXX
 
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
 #include <vector>
 
 class XFTable;
diff --git a/lotuswordpro/inc/xfilter/xfcellstyle.hxx b/lotuswordpro/inc/xfilter/xfcellstyle.hxx
index ead57146a8da..ee3a2c6a8b4a 100644
--- a/lotuswordpro/inc/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfcellstyle.hxx
@@ -64,11 +64,11 @@
 
 #include <rtl/ref.hxx>
 
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfcolor.hxx"
-#include "xfilter/xfmargins.hxx"
-#include "xfilter/xfpadding.hxx"
-#include "xfilter/xfshadow.hxx"
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfcolor.hxx>
+#include <xfilter/xfmargins.hxx>
+#include <xfilter/xfpadding.hxx>
+#include <xfilter/xfshadow.hxx>
 
 #include <memory>
 
diff --git a/lotuswordpro/inc/xfilter/xfchange.hxx b/lotuswordpro/inc/xfilter/xfchange.hxx
index c6914adf756a..4d759cb03aec 100644
--- a/lotuswordpro/inc/xfilter/xfchange.hxx
+++ b/lotuswordpro/inc/xfilter/xfchange.hxx
@@ -61,10 +61,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCHANGE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCHANGE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#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/inc/xfilter/xfcolor.hxx b/lotuswordpro/inc/xfilter/xfcolor.hxx
index dcc7ea047e35..b7ec2f32cb99 100644
--- a/lotuswordpro/inc/xfilter/xfcolor.hxx
+++ b/lotuswordpro/inc/xfilter/xfcolor.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLOR_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLOR_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfcolstyle.hxx b/lotuswordpro/inc/xfilter/xfcolstyle.hxx
index 5fdfe6b22c67..563fd0134031 100644
--- a/lotuswordpro/inc/xfilter/xfcolstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfcolstyle.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLSTYLE_HXX
 
-#include "xfilter/xfstyle.hxx"
+#include <xfilter/xfstyle.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfcolumns.hxx b/lotuswordpro/inc/xfilter/xfcolumns.hxx
index bdfc04cd4272..e3add23822f9 100644
--- a/lotuswordpro/inc/xfilter/xfcolumns.hxx
+++ b/lotuswordpro/inc/xfilter/xfcolumns.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLUMNS_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCOLUMNS_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcolor.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcolor.hxx>
 #include <vector>
 
 #define     XFCOLUMNS_FLAG_SEPARATOR    0X00000001
diff --git a/lotuswordpro/inc/xfilter/xfconfigmanager.hxx b/lotuswordpro/inc/xfilter/xfconfigmanager.hxx
index 941020be85eb..ded25e948ff1 100644
--- a/lotuswordpro/inc/xfilter/xfconfigmanager.hxx
+++ b/lotuswordpro/inc/xfilter/xfconfigmanager.hxx
@@ -60,11 +60,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCONFIGMANAGER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCONFIGMANAGER_HXX
 
-#include "xfilter/xfstylecont.hxx"
-#include "xfilter/xflinenumberconfig.hxx"
-#include "xfilter/xffootnoteconfig.hxx"
-#include "xfilter/xfendnoteconfig.hxx"
-#include "xfilter/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/inc/xfilter/xfcontent.hxx b/lotuswordpro/inc/xfilter/xfcontent.hxx
index a262238ffaa2..611f9daaa719 100644
--- a/lotuswordpro/inc/xfilter/xfcontent.hxx
+++ b/lotuswordpro/inc/xfilter/xfcontent.hxx
@@ -66,7 +66,7 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <stdexcept>
 
-#include "xfilter/xfdefs.hxx"
+#include <xfilter/xfdefs.hxx>
 
 class IXFStream;
 
diff --git a/lotuswordpro/inc/xfilter/xfcontentcontainer.hxx b/lotuswordpro/inc/xfilter/xfcontentcontainer.hxx
index 0717e3f4a371..08a12d9b14ed 100644
--- a/lotuswordpro/inc/xfilter/xfcontentcontainer.hxx
+++ b/lotuswordpro/inc/xfilter/xfcontentcontainer.hxx
@@ -66,7 +66,7 @@
 
 #include <rtl/ref.hxx>
 
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfcontent.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfcrossref.hxx b/lotuswordpro/inc/xfilter/xfcrossref.hxx
index 22240ea6f02c..9126f712b24d 100644
--- a/lotuswordpro/inc/xfilter/xfcrossref.hxx
+++ b/lotuswordpro/inc/xfilter/xfcrossref.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCROSSREF_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFCROSSREF_HXX
 
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfcontent.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfdate.hxx b/lotuswordpro/inc/xfilter/xfdate.hxx
index 66a4f385f99a..73393eb9f5c6 100644
--- a/lotuswordpro/inc/xfilter/xfdate.hxx
+++ b/lotuswordpro/inc/xfilter/xfdate.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
 
 /**
  * @descr   Date object.
diff --git a/lotuswordpro/inc/xfilter/xfdatestyle.hxx b/lotuswordpro/inc/xfilter/xfdatestyle.hxx
index 89f2f69fc164..6b1b2aa0223b 100644
--- a/lotuswordpro/inc/xfilter/xfdatestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfdatestyle.hxx
@@ -60,10 +60,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATESTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDATESTYLE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xftimestyle.hxx"
-#include "xfilter/xfstylecont.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xftimestyle.hxx>
+#include <xfilter/xfstylecont.hxx>
 #include <vector>
 
 class XFDatePart : public XFTimePart
diff --git a/lotuswordpro/inc/xfilter/xfdocfield.hxx b/lotuswordpro/inc/xfilter/xfdocfield.hxx
index 2c99ff846d20..35710eec72eb 100644
--- a/lotuswordpro/inc/xfilter/xfdocfield.hxx
+++ b/lotuswordpro/inc/xfilter/xfdocfield.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDOCFIELD_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDOCFIELD_HXX
 
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfpagecount.hxx"
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfpagecount.hxx>
 
 class XFFileName : public XFContent
 {
diff --git a/lotuswordpro/inc/xfilter/xfdrawgroup.hxx b/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
index 3874ec1f713b..60d561078e2d 100644
--- a/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawgroup.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWGROUP_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWGROUP_HXX
 
-#include "xfilter/xfdrawobj.hxx"
-#include "xfilter/xfframe.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfdrawobj.hxx>
+#include <xfilter/xfframe.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfdrawline.hxx b/lotuswordpro/inc/xfilter/xfdrawline.hxx
index b1d9dc9342f1..32985e53cc8c 100644
--- a/lotuswordpro/inc/xfilter/xfdrawline.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawline.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWLINE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWLINE_HXX
 
-#include "xfilter/xfdrawobj.hxx"
-#include "xfilter/xfpoint.hxx"
+#include <xfilter/xfdrawobj.hxx>
+#include <xfilter/xfpoint.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx b/lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx
index faddd411ea13..20df6dc436bd 100644
--- a/lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWLINESTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWLINESTYLE_HXX
 
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfcolor.hxx"
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfcolor.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfdrawobj.hxx b/lotuswordpro/inc/xfilter/xfdrawobj.hxx
index 8299b2be5112..cecd196e6aeb 100644
--- a/lotuswordpro/inc/xfilter/xfdrawobj.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawobj.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWOBJ_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWOBJ_HXX
 
-#include "xfilter/xfframe.hxx"
-#include "xfilter/xfrect.hxx"
+#include <xfilter/xfframe.hxx>
+#include <xfilter/xfrect.hxx>
 
 #define     XFDRAWOBJECT_FLAG_ROTATE    0X00000001
 #define     XFDRAWOBJECT_FLAG_TRANSLATE 0X00000002
diff --git a/lotuswordpro/inc/xfilter/xfdrawpath.hxx b/lotuswordpro/inc/xfilter/xfdrawpath.hxx
index 50f5785f7d5e..c18c07eb14a9 100644
--- a/lotuswordpro/inc/xfilter/xfdrawpath.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawpath.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPATH_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPATH_HXX
 
-#include "xfilter/xfdrawobj.hxx"
+#include <xfilter/xfdrawobj.hxx>
 #include <vector>
 
 /**
diff --git a/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx b/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx
index 929f21072375..b64de2e504ed 100644
--- a/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPOLYGON_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPOLYGON_HXX
 
-#include "xfilter/xfdrawpolyline.hxx"
+#include <xfilter/xfdrawpolyline.hxx>
 #include <vector>
 
 /**
diff --git a/lotuswordpro/inc/xfilter/xfdrawpolyline.hxx b/lotuswordpro/inc/xfilter/xfdrawpolyline.hxx
index 00c1d28e42a3..4e7ff34c760e 100644
--- a/lotuswordpro/inc/xfilter/xfdrawpolyline.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawpolyline.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPOLYLINE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWPOLYLINE_HXX
 
-#include "xfilter/xfdrawobj.hxx"
+#include <xfilter/xfdrawobj.hxx>
 #include <vector>
 
 class XFDrawPolyline : public XFDrawObject
diff --git a/lotuswordpro/inc/xfilter/xfdrawrect.hxx b/lotuswordpro/inc/xfilter/xfdrawrect.hxx
index 6b20858b7af2..e6036a9fa3eb 100644
--- a/lotuswordpro/inc/xfilter/xfdrawrect.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawrect.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWRECT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWRECT_HXX
 
-#include "xfilter/xfdrawobj.hxx"
+#include <xfilter/xfdrawobj.hxx>
 
 class XFDrawRect : public XFDrawObject
 {
diff --git a/lotuswordpro/inc/xfilter/xfdrawstyle.hxx b/lotuswordpro/inc/xfilter/xfdrawstyle.hxx
index d5235ef953f2..e6ea960100ca 100644
--- a/lotuswordpro/inc/xfilter/xfdrawstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfdrawstyle.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDRAWSTYLE_HXX
 
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfcolor.hxx"
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfcolor.hxx>
 #include <cassert>
 
 class XFDrawLineStyle;
diff --git a/lotuswordpro/inc/xfilter/xfdropcap.hxx b/lotuswordpro/inc/xfilter/xfdropcap.hxx
index 1856a73ef55b..d5f9213a8212 100644
--- a/lotuswordpro/inc/xfilter/xfdropcap.hxx
+++ b/lotuswordpro/inc/xfilter/xfdropcap.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDROPCAP_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFDROPCAP_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 
 class XFDropcap
 {
diff --git a/lotuswordpro/inc/xfilter/xfendnote.hxx b/lotuswordpro/inc/xfilter/xfendnote.hxx
index 239bd38930d4..1d70943a0aa6 100644
--- a/lotuswordpro/inc/xfilter/xfendnote.hxx
+++ b/lotuswordpro/inc/xfilter/xfendnote.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENDNOTE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENDNOTE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfentry.hxx b/lotuswordpro/inc/xfilter/xfentry.hxx
index 1c1d50cec47a..6f7f974306c7 100644
--- a/lotuswordpro/inc/xfilter/xfentry.hxx
+++ b/lotuswordpro/inc/xfilter/xfentry.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENTRY_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFENTRY_HXX
 
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfcontent.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xffloatframe.hxx b/lotuswordpro/inc/xfilter/xffloatframe.hxx
index 9f01e551d8d4..9ca225d4017d 100644
--- a/lotuswordpro/inc/xfilter/xffloatframe.hxx
+++ b/lotuswordpro/inc/xfilter/xffloatframe.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFLOATFRAME_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFLOATFRAME_HXX
 
-#include "xfilter/xfframe.hxx"
+#include <xfilter/xfframe.hxx>
 #include <vector>
 
 /**
diff --git a/lotuswordpro/inc/xfilter/xffont.hxx b/lotuswordpro/inc/xfilter/xffont.hxx
index b5b472456789..43c6fa21aca9 100644
--- a/lotuswordpro/inc/xfilter/xffont.hxx
+++ b/lotuswordpro/inc/xfilter/xffont.hxx
@@ -64,8 +64,8 @@
 
 #include <salhelper/simplereferenceobject.hxx>
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/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/inc/xfilter/xffontdecl.hxx b/lotuswordpro/inc/xfilter/xffontdecl.hxx
index a65b267265a5..95e273e36ddb 100644
--- a/lotuswordpro/inc/xfilter/xffontdecl.hxx
+++ b/lotuswordpro/inc/xfilter/xffontdecl.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFONTDECL_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFONTDECL_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xffontfactory.hxx b/lotuswordpro/inc/xfilter/xffontfactory.hxx
index 47bc5db7b561..def08f3a24d2 100644
--- a/lotuswordpro/inc/xfilter/xffontfactory.hxx
+++ b/lotuswordpro/inc/xfilter/xffontfactory.hxx
@@ -64,8 +64,8 @@
 
 #include <rtl/ref.hxx>
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xffont.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xffont.hxx>
 #include <vector>
 
 /**
diff --git a/lotuswordpro/inc/xfilter/xffooter.hxx b/lotuswordpro/inc/xfilter/xffooter.hxx
index 4f6326a28253..9821154c53f5 100644
--- a/lotuswordpro/inc/xfilter/xffooter.hxx
+++ b/lotuswordpro/inc/xfilter/xffooter.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTER_HXX
 
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfcontentcontainer.hxx>
 #include <vector>
 
 /**
diff --git a/lotuswordpro/inc/xfilter/xffooterstyle.hxx b/lotuswordpro/inc/xfilter/xffooterstyle.hxx
index b3cc2a1a7d7c..ecddefcaaee2 100644
--- a/lotuswordpro/inc/xfilter/xffooterstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xffooterstyle.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTERSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTERSTYLE_HXX
 
-#include "xfilter/xfheaderstyle.hxx"
-#include "xfilter/xfmargins.hxx"
+#include <xfilter/xfheaderstyle.hxx>
+#include <xfilter/xfmargins.hxx>
 
 class XFFooterStyle : public XFHeaderStyle
 {
diff --git a/lotuswordpro/inc/xfilter/xffootnote.hxx b/lotuswordpro/inc/xfilter/xffootnote.hxx
index 03c795714f41..575860a9a7be 100644
--- a/lotuswordpro/inc/xfilter/xffootnote.hxx
+++ b/lotuswordpro/inc/xfilter/xffootnote.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx b/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx
index 95684ed61d78..916c81c9f610 100644
--- a/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx
+++ b/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTECONFIG_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFOOTNOTECONFIG_HXX
 
-#include "xfilter/xfstyle.hxx"
+#include <xfilter/xfstyle.hxx>
 
 class XFFootnoteConfig : public XFStyle
 {
diff --git a/lotuswordpro/inc/xfilter/xfframe.hxx b/lotuswordpro/inc/xfilter/xfframe.hxx
index b67fac5f6c2f..1f25082d8eb1 100644
--- a/lotuswordpro/inc/xfilter/xfframe.hxx
+++ b/lotuswordpro/inc/xfilter/xfframe.hxx
@@ -61,10 +61,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAME_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAME_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfrect.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfrect.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
 
 #define     XFFRAME_FLAG_HEIGHT         0x00000001
 #define     XFFRAME_FLAG_MINHEIGHT      0x00000002
diff --git a/lotuswordpro/inc/xfilter/xfframestyle.hxx b/lotuswordpro/inc/xfilter/xfframestyle.hxx
index aee192104892..11db8a900896 100644
--- a/lotuswordpro/inc/xfilter/xfframestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfframestyle.hxx
@@ -61,11 +61,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAMESTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFFRAMESTYLE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfmargins.hxx"
-#include "xfilter/xfcolor.hxx"
-#include "xfilter/xfpadding.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfmargins.hxx>
+#include <xfilter/xfcolor.hxx>
+#include <xfilter/xfpadding.hxx>
 
 class XFBorders;
 class XFColumns;
diff --git a/lotuswordpro/inc/xfilter/xfglobal.hxx b/lotuswordpro/inc/xfilter/xfglobal.hxx
index 5b829a8382c4..088e24611124 100644
--- a/lotuswordpro/inc/xfilter/xfglobal.hxx
+++ b/lotuswordpro/inc/xfilter/xfglobal.hxx
@@ -67,11 +67,11 @@
 
 #include <rtl/ustring.hxx>
 
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/ixfattrlist.hxx"
+#include <xfilter/ixfstream.hxx>
+#include <xfilter/ixfattrlist.hxx>
 
-#include "xfilter/xfutil.hxx"
-#include "xfilter/xfdefs.hxx"
+#include <xfilter/xfutil.hxx>
+#include <xfilter/xfdefs.hxx>
 
 #define PI 3.1415926
 #define FLOAT_MIN   0.001
diff --git a/lotuswordpro/inc/xfilter/xfheader.hxx b/lotuswordpro/inc/xfilter/xfheader.hxx
index 511a7036f6d1..0d9b6bbf69f3 100644
--- a/lotuswordpro/inc/xfilter/xfheader.hxx
+++ b/lotuswordpro/inc/xfilter/xfheader.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHEADER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHEADER_HXX
 
-#include "xfilter/xfcontentcontainer.hxx"
-#include "xfilter/xfparagraph.hxx"
+#include <xfilter/xfcontentcontainer.hxx>
+#include <xfilter/xfparagraph.hxx>
 #include <vector>
 
 class XFHeader : public XFContentContainer
diff --git a/lotuswordpro/inc/xfilter/xfheaderstyle.hxx b/lotuswordpro/inc/xfilter/xfheaderstyle.hxx
index 8b87589e3d76..16795bcf56d1 100644
--- a/lotuswordpro/inc/xfilter/xfheaderstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfheaderstyle.hxx
@@ -60,11 +60,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHEADERSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFHEADERSTYLE_HXX
 
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfmargins.hxx"
-#include "xfilter/xfborders.hxx"
-#include "xfilter/xfpadding.hxx"
-#include "xfilter/xfshadow.hxx"
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfmargins.hxx>
+#include <xfilter/xfborders.hxx>
+#include <xfilter/xfpadding.hxx>
+#include <xfilter/xfshadow.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfimage.hxx b/lotuswordpro/inc/xfilter/xfimage.hxx
index 7a16f16d8970..019e509167a5 100644
--- a/lotuswordpro/inc/xfilter/xfimage.hxx
+++ b/lotuswordpro/inc/xfilter/xfimage.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFIMAGE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFIMAGE_HXX
 
-#include "xfilter/xfframe.hxx"
+#include <xfilter/xfframe.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfimagestyle.hxx b/lotuswordpro/inc/xfilter/xfimagestyle.hxx
index 5c2de63c79d2..1bbf96a152c4 100644
--- a/lotuswordpro/inc/xfilter/xfimagestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfimagestyle.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFIMAGESTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFIMAGESTYLE_HXX
 
-#include "xfilter/xfframestyle.hxx"
-#include "xfilter/xfrect.hxx"
+#include <xfilter/xfframestyle.hxx>
+#include <xfilter/xfrect.hxx>
 
 class XFImageStyle : public XFFrameStyle
 {
diff --git a/lotuswordpro/inc/xfilter/xfindex.hxx b/lotuswordpro/inc/xfilter/xfindex.hxx
index 890d7f92e4c6..4fb0aa127e41 100644
--- a/lotuswordpro/inc/xfilter/xfindex.hxx
+++ b/lotuswordpro/inc/xfilter/xfindex.hxx
@@ -62,9 +62,9 @@
 #include <map>
 #include <vector>
 
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
-#include "xfilter/xftabstop.hxx"
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
+#include <xfilter/xftabstop.hxx>
 
 class XFIndex;
 class XFIndexTemplate;
diff --git a/lotuswordpro/inc/xfilter/xfinputlist.hxx b/lotuswordpro/inc/xfilter/xfinputlist.hxx
index e938c42ac755..455522f41f1b 100644
--- a/lotuswordpro/inc/xfilter/xfinputlist.hxx
+++ b/lotuswordpro/inc/xfilter/xfinputlist.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFINPUTLIST_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFINPUTLIST_HXX
 
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfcontent.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xflinebreak.hxx b/lotuswordpro/inc/xfilter/xflinebreak.hxx
index 9052c35a4cad..5267b4e157b3 100644
--- a/lotuswordpro/inc/xfilter/xflinebreak.hxx
+++ b/lotuswordpro/inc/xfilter/xflinebreak.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINEBREAK_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINEBREAK_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
 
 class XFLineBreak : public XFContent
 {
diff --git a/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx b/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx
index 93fe00ae0d5b..46ab46e01aaf 100644
--- a/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx
+++ b/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINENUMBERCONFIG_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLINENUMBERCONFIG_HXX
 
-#include "xfilter/xfstyle.hxx"
+#include <xfilter/xfstyle.hxx>
 
 class XFLineNumberConfig : public XFStyle
 {
diff --git a/lotuswordpro/inc/xfilter/xflist.hxx b/lotuswordpro/inc/xfilter/xflist.hxx
index 865ee6c3ac12..4f2e1f01e22b 100644
--- a/lotuswordpro/inc/xfilter/xflist.hxx
+++ b/lotuswordpro/inc/xfilter/xflist.hxx
@@ -61,7 +61,7 @@
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLIST_HXX
 
 #include "xflistitem.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfcontentcontainer.hxx>
 
 class XFListItem;
 
diff --git a/lotuswordpro/inc/xfilter/xflistitem.hxx b/lotuswordpro/inc/xfilter/xflistitem.hxx
index 1073be60ef63..bc11fb129f37 100644
--- a/lotuswordpro/inc/xfilter/xflistitem.hxx
+++ b/lotuswordpro/inc/xfilter/xflistitem.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTITEM_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTITEM_HXX
 
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
-#include "xfilter/xfparagraph.hxx"
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
+#include <xfilter/xfparagraph.hxx>
 
 class   XFListItem : public XFContentContainer
 {
diff --git a/lotuswordpro/inc/xfilter/xfliststyle.hxx b/lotuswordpro/inc/xfilter/xfliststyle.hxx
index fd993c322ea0..24838063ae38 100644
--- a/lotuswordpro/inc/xfilter/xfliststyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfliststyle.hxx
@@ -60,10 +60,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFLISTSTYLE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfnumfmt.hxx"
-#include "unicode/utypes.h"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfnumfmt.hxx>
+#include <unicode/utypes.h>
 #include <memory>
 #include <vector>
 
diff --git a/lotuswordpro/inc/xfilter/xfmargins.hxx b/lotuswordpro/inc/xfilter/xfmargins.hxx
index 56b964477b8b..2705304d3004 100644
--- a/lotuswordpro/inc/xfilter/xfmargins.hxx
+++ b/lotuswordpro/inc/xfilter/xfmargins.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMARGINS_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMARGINS_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 
 #define     XFMARGINS_FLAG_LEFT     0x00000001
 #define     XFMARGINS_FLAG_RIGHT    0x00000002
diff --git a/lotuswordpro/inc/xfilter/xfmasterpage.hxx b/lotuswordpro/inc/xfilter/xfmasterpage.hxx
index 5c8c17140ff8..649aca9c57af 100644
--- a/lotuswordpro/inc/xfilter/xfmasterpage.hxx
+++ b/lotuswordpro/inc/xfilter/xfmasterpage.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMASTERPAGE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFMASTERPAGE_HXX
 
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
 
 class XFFooter;
 class XFHeader;
diff --git a/lotuswordpro/inc/xfilter/xfnumberstyle.hxx b/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
index 4d4693a54c51..f84d0755c9cc 100644
--- a/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfnumberstyle.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMBERSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMBERSTYLE_HXX
 
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/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/inc/xfilter/xfnumfmt.hxx b/lotuswordpro/inc/xfilter/xfnumfmt.hxx
index e61d01058ae3..dad4b0018749 100644
--- a/lotuswordpro/inc/xfilter/xfnumfmt.hxx
+++ b/lotuswordpro/inc/xfilter/xfnumfmt.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMFMT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFNUMFMT_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfofficemeta.hxx b/lotuswordpro/inc/xfilter/xfofficemeta.hxx
index 970dd4229a27..0b6334a5e51a 100644
--- a/lotuswordpro/inc/xfilter/xfofficemeta.hxx
+++ b/lotuswordpro/inc/xfilter/xfofficemeta.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFOFFICEMETA_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFOFFICEMETA_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 
 class XFOfficeMeta final
 {
diff --git a/lotuswordpro/inc/xfilter/xfpadding.hxx b/lotuswordpro/inc/xfilter/xfpadding.hxx
index d357a0e2172d..10b639a605a1 100644
--- a/lotuswordpro/inc/xfilter/xfpadding.hxx
+++ b/lotuswordpro/inc/xfilter/xfpadding.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPADDING_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPADDING_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 
 #define XFPADDING_FLAG_LEFT     0X00000001
 #define XFPADDING_FLAG_RIGHT    0X00000002
diff --git a/lotuswordpro/inc/xfilter/xfpagecount.hxx b/lotuswordpro/inc/xfilter/xfpagecount.hxx
index 984e5f60da94..8344d2abd1f0 100644
--- a/lotuswordpro/inc/xfilter/xfpagecount.hxx
+++ b/lotuswordpro/inc/xfilter/xfpagecount.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGECOUNT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGECOUNT_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfnumfmt.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfnumfmt.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfpagemaster.hxx b/lotuswordpro/inc/xfilter/xfpagemaster.hxx
index b9f1d125471f..3a1e5cdcae50 100644
--- a/lotuswordpro/inc/xfilter/xfpagemaster.hxx
+++ b/lotuswordpro/inc/xfilter/xfpagemaster.hxx
@@ -61,10 +61,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGEMASTER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGEMASTER_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfcolor.hxx"
-#include "xfilter/xfmargins.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfcolor.hxx>
+#include <xfilter/xfmargins.hxx>
 
 class XFBorders;
 class XFShadow;
diff --git a/lotuswordpro/inc/xfilter/xfpagenumber.hxx b/lotuswordpro/inc/xfilter/xfpagenumber.hxx
index 9de71288eaa8..9e051764a852 100644
--- a/lotuswordpro/inc/xfilter/xfpagenumber.hxx
+++ b/lotuswordpro/inc/xfilter/xfpagenumber.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGENUMBER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPAGENUMBER_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfnumfmt.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfnumfmt.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfparagraph.hxx b/lotuswordpro/inc/xfilter/xfparagraph.hxx
index b78ea1d28692..20ad256cc769 100644
--- a/lotuswordpro/inc/xfilter/xfparagraph.hxx
+++ b/lotuswordpro/inc/xfilter/xfparagraph.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPARAGRAPH_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPARAGRAPH_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
 #include <vector>
 
 class IXFStream;
diff --git a/lotuswordpro/inc/xfilter/xfparastyle.hxx b/lotuswordpro/inc/xfilter/xfparastyle.hxx
index 9bfb67c392f1..2992a3bc0fa2 100644
--- a/lotuswordpro/inc/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfparastyle.hxx
@@ -66,17 +66,17 @@
 
 #include <rtl/ref.hxx>
 
-#include "xfilter/xffont.hxx"
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfcolor.hxx"
-#include "xfilter/xfmargins.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"
+#include <xfilter/xffont.hxx>
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfcolor.hxx>
+#include <xfilter/xfmargins.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/inc/xfilter/xfplaceholder.hxx b/lotuswordpro/inc/xfilter/xfplaceholder.hxx
index b5e2992d4fc1..2d4f65a138c4 100644
--- a/lotuswordpro/inc/xfilter/xfplaceholder.hxx
+++ b/lotuswordpro/inc/xfilter/xfplaceholder.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPLACEHOLDER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFPLACEHOLDER_HXX
 
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfcontent.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfrect.hxx b/lotuswordpro/inc/xfilter/xfrect.hxx
index 7bd89eaf2d52..406e2cf158f3 100644
--- a/lotuswordpro/inc/xfilter/xfrect.hxx
+++ b/lotuswordpro/inc/xfilter/xfrect.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRECT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRECT_HXX
 
-#include "xfilter/xfpoint.hxx"
+#include <xfilter/xfpoint.hxx>
 
 class XFRect
 {
diff --git a/lotuswordpro/inc/xfilter/xfrow.hxx b/lotuswordpro/inc/xfilter/xfrow.hxx
index 01f078e91eb1..1f2a1e430e03 100644
--- a/lotuswordpro/inc/xfilter/xfrow.hxx
+++ b/lotuswordpro/inc/xfilter/xfrow.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFROW_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFROW_HXX
 
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfcontent.hxx>
 #include <rtl/ref.hxx>
 #include <map>
 
diff --git a/lotuswordpro/inc/xfilter/xfrowstyle.hxx b/lotuswordpro/inc/xfilter/xfrowstyle.hxx
index b8b20531703e..41fc1c2adc76 100644
--- a/lotuswordpro/inc/xfilter/xfrowstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfrowstyle.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFROWSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFROWSTYLE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfcolor.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfcolor.hxx>
 
 class XFBGImage;
 class XFRowStyle : public XFStyle
diff --git a/lotuswordpro/inc/xfilter/xfruby.hxx b/lotuswordpro/inc/xfilter/xfruby.hxx
index fd0e64e45147..e5be9f30c92b 100644
--- a/lotuswordpro/inc/xfilter/xfruby.hxx
+++ b/lotuswordpro/inc/xfilter/xfruby.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBY_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBY_HXX
 
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfcontent.hxx>
 
 class XFRubyStart : public XFContent
 {
diff --git a/lotuswordpro/inc/xfilter/xfrubystyle.hxx b/lotuswordpro/inc/xfilter/xfrubystyle.hxx
index e89dbf51c8b3..3789fba7c73b 100644
--- a/lotuswordpro/inc/xfilter/xfrubystyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfrubystyle.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBYSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFRUBYSTYLE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfdefs.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfdefs.hxx>
 
 class XFRubyStyle : public XFStyle
 {
diff --git a/lotuswordpro/inc/xfilter/xfsaxstream.hxx b/lotuswordpro/inc/xfilter/xfsaxstream.hxx
index 25191c463f07..36be72a3823f 100644
--- a/lotuswordpro/inc/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/inc/xfilter/xfsaxstream.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSAXSTREAM_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSAXSTREAM_HXX
 
-#include "xfilter/ixfstream.hxx"
+#include <xfilter/ixfstream.hxx>
 #include <memory>
 
 #include <cppuhelper/factory.hxx>
diff --git a/lotuswordpro/inc/xfilter/xfsection.hxx b/lotuswordpro/inc/xfilter/xfsection.hxx
index 5c464d27f454..7ed02943d7b7 100644
--- a/lotuswordpro/inc/xfilter/xfsection.hxx
+++ b/lotuswordpro/inc/xfilter/xfsection.hxx
@@ -60,9 +60,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTION_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTION_HXX
 
-#include "xfilter/xfcontentcontainer.hxx"
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfcolor.hxx"
+#include <xfilter/xfcontentcontainer.hxx>
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfcolor.hxx>
 #include <vector>
 
 /**
diff --git a/lotuswordpro/inc/xfilter/xfsectionstyle.hxx b/lotuswordpro/inc/xfilter/xfsectionstyle.hxx
index 8dd73b5be836..2906ea132c28 100644
--- a/lotuswordpro/inc/xfilter/xfsectionstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfsectionstyle.hxx
@@ -60,10 +60,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTIONSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSECTIONSTYLE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfbgimage.hxx"
-#include "xfilter/xfcolor.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfbgimage.hxx>
+#include <xfilter/xfcolor.hxx>
 #include <memory>
 
 class XFColumns;
diff --git a/lotuswordpro/inc/xfilter/xfshadow.hxx b/lotuswordpro/inc/xfilter/xfshadow.hxx
index 72602488fb9d..114a5debae93 100644
--- a/lotuswordpro/inc/xfilter/xfshadow.hxx
+++ b/lotuswordpro/inc/xfilter/xfshadow.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSHADOW_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSHADOW_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcolor.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcolor.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfstyle.hxx b/lotuswordpro/inc/xfilter/xfstyle.hxx
index d0a3cb9374f6..1e82c92e9642 100644
--- a/lotuswordpro/inc/xfilter/xfstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfstyle.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLE_HXX
 
-#include "xfilter/ixfstyle.hxx"
+#include <xfilter/ixfstyle.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/inc/xfilter/xfstylecont.hxx b/lotuswordpro/inc/xfilter/xfstylecont.hxx
index 5adfe71185b0..12b6c751d3aa 100644
--- a/lotuswordpro/inc/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/inc/xfilter/xfstylecont.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLECONT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLECONT_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 #include <vector>
 
 class IXFStyle;
diff --git a/lotuswordpro/inc/xfilter/xfstylemanager.hxx b/lotuswordpro/inc/xfilter/xfstylemanager.hxx
index 9a2c5ca0cec3..fa5649b6492f 100644
--- a/lotuswordpro/inc/xfilter/xfstylemanager.hxx
+++ b/lotuswordpro/inc/xfilter/xfstylemanager.hxx
@@ -60,10 +60,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLEMANAGER_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFSTYLEMANAGER_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xffontdecl.hxx"
-#include "xfilter/xfstylecont.hxx"
-#include "xfilter/xfconfigmanager.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xffontdecl.hxx>
+#include <xfilter/xfstylecont.hxx>
+#include <xfilter/xfconfigmanager.hxx>
 #include <map>
 #include <vector>
 
diff --git a/lotuswordpro/inc/xfilter/xftable.hxx b/lotuswordpro/inc/xfilter/xftable.hxx
index fd5130c435d3..2ba1199f47ec 100644
--- a/lotuswordpro/inc/xfilter/xftable.hxx
+++ b/lotuswordpro/inc/xfilter/xftable.hxx
@@ -60,10 +60,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABLE_HXX
 
-#include "xfilter/xfcontent.hxx"
-#include "xfilter/xfrow.hxx"
-#include "xfilter/xfcell.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfcontent.hxx>
+#include <xfilter/xfrow.hxx>
+#include <xfilter/xfcell.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
 #include <map>
 #include <vector>
 
diff --git a/lotuswordpro/inc/xfilter/xftablestyle.hxx b/lotuswordpro/inc/xfilter/xftablestyle.hxx
index 899ea33b8822..55b318c4f0a9 100644
--- a/lotuswordpro/inc/xfilter/xftablestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftablestyle.hxx
@@ -60,11 +60,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABLESTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABLESTYLE_HXX
 
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfmargins.hxx"
-#include "xfilter/xfshadow.hxx"
-#include "xfilter/xfcolor.hxx"
-#include "xfilter/xfbreaks.hxx"
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfmargins.hxx>
+#include <xfilter/xfshadow.hxx>
+#include <xfilter/xfcolor.hxx>
+#include <xfilter/xfbreaks.hxx>
 #include <memory>
 
 class XFBGImage;
diff --git a/lotuswordpro/inc/xfilter/xftabstop.hxx b/lotuswordpro/inc/xfilter/xftabstop.hxx
index 2b569d48e681..ebdfc8adca44 100644
--- a/lotuswordpro/inc/xfilter/xftabstop.hxx
+++ b/lotuswordpro/inc/xfilter/xftabstop.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABSTOP_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTABSTOP_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
 
 class XFTabStop : public XFContent
 {
diff --git a/lotuswordpro/inc/xfilter/xftextboxstyle.hxx b/lotuswordpro/inc/xfilter/xftextboxstyle.hxx
index b6b1aa72e7e8..02594509d1d7 100644
--- a/lotuswordpro/inc/xfilter/xftextboxstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftextboxstyle.hxx
@@ -56,11 +56,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTBOXSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTBOXSTYLE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
-#include "xfilter/xfmargins.hxx"
-#include "xfilter/xfcolor.hxx"
-#include "xfilter/xfpadding.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
+#include <xfilter/xfmargins.hxx>
+#include <xfilter/xfcolor.hxx>
+#include <xfilter/xfpadding.hxx>
 
 /**
 * @brief
diff --git a/lotuswordpro/inc/xfilter/xftextcontent.hxx b/lotuswordpro/inc/xfilter/xftextcontent.hxx
index 5995e43b074c..7bce6c8bd4dd 100644
--- a/lotuswordpro/inc/xfilter/xftextcontent.hxx
+++ b/lotuswordpro/inc/xfilter/xftextcontent.hxx
@@ -57,8 +57,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTCONTENT_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTEXTCONTENT_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
 
 class IXFStream;
 
diff --git a/lotuswordpro/inc/xfilter/xftextspan.hxx b/lotuswordpro/inc/xfilter/xftextspan.hxx
index 7596c6cc148d..500d002174d3 100644
--- a/lotuswordpro/inc/xfilter/xftextspan.hxx
+++ b/lotuswordpro/inc/xfilter/xftextspan.hxx
@@ -66,8 +66,8 @@
 
 #include <rtl/ref.hxx>
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfcontent.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfcontent.hxx>
 
 class IXFStream;
 
diff --git a/lotuswordpro/inc/xfilter/xftextstyle.hxx b/lotuswordpro/inc/xfilter/xftextstyle.hxx
index 9dbfd99cec28..24653ebbcf94 100644
--- a/lotuswordpro/inc/xfilter/xftextstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftextstyle.hxx
@@ -65,8 +65,8 @@
 
 #include <rtl/ref.hxx>
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
 
 class   IXFStream;
 class   XFFont;
diff --git a/lotuswordpro/inc/xfilter/xftimestyle.hxx b/lotuswordpro/inc/xfilter/xftimestyle.hxx
index cc3ece2f5858..a6a388f06ee6 100644
--- a/lotuswordpro/inc/xfilter/xftimestyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftimestyle.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTIMESTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFTIMESTYLE_HXX
 
-#include "xfilter/xfglobal.hxx"
-#include "xfilter/xfstyle.hxx"
+#include <xfilter/xfglobal.hxx>
+#include <xfilter/xfstyle.hxx>
 #include <vector>
 
 class XFDateTimePart : public XFStyle
diff --git a/lotuswordpro/inc/xfilter/xfutil.hxx b/lotuswordpro/inc/xfilter/xfutil.hxx
index 076a35ac2c3f..31259acc7568 100644
--- a/lotuswordpro/inc/xfilter/xfutil.hxx
+++ b/lotuswordpro/inc/xfilter/xfutil.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFUTIL_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFUTIL_HXX
 
-#include "xfilter/xfdefs.hxx"
+#include <xfilter/xfdefs.hxx>
 #include <rtl/ustring.hxx>
 #include <string>
 
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index 1ee75763e94e..86a47bf4949e 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -54,7 +54,7 @@
  *
  ************************************************************************/
 #include "first.hxx"
-#include "assert.h"
+#include <assert.h>
 #include <stdio.h>
 #include <osl/diagnose.h>
 #include <sot/storinfo.hxx>
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 51e379c4c731..156674287305 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -61,7 +61,7 @@
 #include <cstring>
 #include <string>
 #include <vector>
-#include "lwpsvstream.hxx"
+#include <lwpsvstream.hxx>
 
 #define BEN_CC __stdcall
 #ifdef COMP_BENTO
diff --git a/lotuswordpro/source/filter/benval.cxx b/lotuswordpro/source/filter/benval.cxx
index 674efcda0dd3..9ccc1a2efe09 100644
--- a/lotuswordpro/source/filter/benval.cxx
+++ b/lotuswordpro/source/filter/benval.cxx
@@ -60,7 +60,7 @@
 #include <cstring>
 
 #include "first.hxx"
-#include "assert.h"
+#include <assert.h>
 namespace OpenStormBento
 {
 
diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx
index 9bb702b27271..47d202412724 100644
--- a/lotuswordpro/source/filter/localtime.cxx
+++ b/lotuswordpro/source/filter/localtime.cxx
@@ -53,7 +53,7 @@
  *
  *
  ************************************************************************/
-#include "localtime.hxx"
+#include <localtime.hxx>
 #include <limits.h>
 #include <unicode/timezone.h>
 
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index e7c670a064de..60a2911a7ca9 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -55,14 +55,14 @@
  ************************************************************************/
 
 #include "lwp9reader.hxx"
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwparrowstyles.hxx"
-#include "lwpobjhdr.hxx"
+#include <lwpobjhdr.hxx>
 #include "lwpdoc.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "lwpdocdata.hxx"
-#include "lwpbookmarkmgr.hxx"
-#include "lwpchangemgr.hxx"
+#include <xfilter/xfstylemanager.hxx>
+#include <lwpdocdata.hxx>
+#include <lwpbookmarkmgr.hxx>
+#include <lwpchangemgr.hxx>
 #include <tools/stream.hxx>
 
 Lwp9Reader::Lwp9Reader (LwpSvStream* pInputStream, IXFStream* pStream)
diff --git a/lotuswordpro/source/filter/lwp9reader.hxx b/lotuswordpro/source/filter/lwp9reader.hxx
index 3d1ac4bb1a0a..05bc935fc9b2 100644
--- a/lotuswordpro/source/filter/lwp9reader.hxx
+++ b/lotuswordpro/source/filter/lwp9reader.hxx
@@ -56,11 +56,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWP9READER_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWP9READER_HXX
 
-#include "lwpheader.hxx"
-#include "lwpsvstream.hxx"
-#include "lwpfilehdr.hxx"
-#include "lwpobjfactory.hxx"
-#include "xfilter/ixfstream.hxx"
+#include <lwpheader.hxx>
+#include <lwpsvstream.hxx>
+#include <lwpfilehdr.hxx>
+#include <lwpobjfactory.hxx>
+#include <xfilter/ixfstream.hxx>
 
 /**
  * @brief   Reader framework class for Lotus Word Pro 9 file
diff --git a/lotuswordpro/source/filter/lwparrowstyles.hxx b/lotuswordpro/source/filter/lwparrowstyles.hxx
index 6db88292d0b1..c6057e9a982a 100644
--- a/lotuswordpro/source/filter/lwparrowstyles.hxx
+++ b/lotuswordpro/source/filter/lwparrowstyles.hxx
@@ -56,9 +56,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPARROWSTYLES_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPARROWSTYLES_HXX
 
-#include "xfilter/xfarrowstyle.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "lwpglobalmgr.hxx"
+#include <xfilter/xfarrowstyle.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <lwpglobalmgr.hxx>
 
 /**
  * @descr   Register arrow styles that are not directly support by SODC.
diff --git a/lotuswordpro/source/filter/lwpatomholder.cxx b/lotuswordpro/source/filter/lwpatomholder.cxx
index 52bba078da0e..a9a25173460c 100644
--- a/lotuswordpro/source/filter/lwpatomholder.cxx
+++ b/lotuswordpro/source/filter/lwpatomholder.cxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#include "lwpatomholder.hxx"
-#include "lwptools.hxx"
+#include <lwpatomholder.hxx>
+#include <lwptools.hxx>
 #include <osl/thread.h>
 #include <rtl/textenc.h>
 
diff --git a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
index dc025d61fec4..757209880476 100644
--- a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
@@ -56,7 +56,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDOVERRIDE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDOVERRIDE_HXX
 
-#include "lwpoverride.hxx"
+#include <lwpoverride.hxx>
 #include "lwpbackgroundstuff.hxx"
 
 class LwpObjectStream;
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
index b1b517f3040a..90a77cb8eb19 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
@@ -61,7 +61,7 @@
 
 #include "lwpbackgroundstuff.hxx"
 #include "lwppttntbl.hxx"
-#include "xfilter/xfbgimage.hxx"
+#include <xfilter/xfbgimage.hxx>
 
 #include <tools/stream.hxx>
 #include <vcl/dibtools.hxx>
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
index 29fd54a41c17..6f3ab8a1ca16 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
@@ -59,7 +59,7 @@
 ************************************************************************/
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDSTUFF_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDSTUFF_HXX
-#include "lwpcolor.hxx"
+#include <lwpcolor.hxx>
 
 /* background patterns */
 #define BACK_TRANSPARENT    0
diff --git a/lotuswordpro/source/filter/lwpbasetype.cxx b/lotuswordpro/source/filter/lwpbasetype.cxx
index 8f26a6acf11d..9c5ab7f895ca 100644
--- a/lotuswordpro/source/filter/lwpbasetype.cxx
+++ b/lotuswordpro/source/filter/lwpbasetype.cxx
@@ -53,7 +53,7 @@
  *
  *
  ************************************************************************/
-#include "lwpbasetype.hxx"
+#include <lwpbasetype.hxx>
 /**
  * @descr       read PonoseNumber from object stream
 */
diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
index bfec019fbfd4..fdfed20edf6c 100644
--- a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
+++ b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
@@ -53,7 +53,7 @@
  *
  *
  ************************************************************************/
-#include "lwpbookmarkmgr.hxx"
+#include <lwpbookmarkmgr.hxx>
 
 void LwpBookmarkMgr::AddXFBookmarkStart(const OUString& sName,XFBookmarkStart* pMark)
 {
diff --git a/lotuswordpro/source/filter/lwpborderstuff.cxx b/lotuswordpro/source/filter/lwpborderstuff.cxx
index 06cfa6e1d511..1e70e2e30e54 100644
--- a/lotuswordpro/source/filter/lwpborderstuff.cxx
+++ b/lotuswordpro/source/filter/lwpborderstuff.cxx
@@ -59,8 +59,8 @@
 ************************************************************************/
 #include "lwpborderstuff.hxx"
 #include "lwpstyledef.hxx"
-#include "lwpfilehdr.hxx"
-#include "lwptools.hxx"
+#include <lwpfilehdr.hxx>
+#include <lwptools.hxx>
 
 LwpBorderStuff::LwpBorderStuff()
 {
diff --git a/lotuswordpro/source/filter/lwpborderstuff.hxx b/lotuswordpro/source/filter/lwpborderstuff.hxx
index f59abffca7e7..f9c77a292239 100644
--- a/lotuswordpro/source/filter/lwpborderstuff.hxx
+++ b/lotuswordpro/source/filter/lwpborderstuff.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBORDERSTUFF_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBORDERSTUFF_HXX
 
-#include "lwpcolor.hxx"
+#include <lwpcolor.hxx>
 
 class LwpBorderStuff
 {
diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.cxx b/lotuswordpro/source/filter/lwpbreaksoverride.cxx
index 9d5925269fbb..8ffb8ab259e8 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.cxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.cxx
@@ -61,8 +61,8 @@
 
 #include "clone.hxx"
 #include "lwpbreaksoverride.hxx"
-#include "lwpobjstrm.hxx"
-#include "lwpatomholder.hxx"
+#include <lwpobjstrm.hxx>
+#include <lwpatomholder.hxx>
 
 LwpBreaksOverride::LwpBreaksOverride()
     : m_pNextStyle( new LwpAtomHolder )
diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.hxx b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
index 729f983d5a11..d8b629b62218 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
@@ -61,7 +61,7 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBREAKSOVERRIDE_HXX
 
 #include <memory>
-#include "lwpoverride.hxx"
+#include <lwpoverride.hxx>
 
 class LwpObjectStream;
 class LwpAtomHolder;
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 38a5f5b92fd2..5d096cccd3ae 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -64,13 +64,13 @@
 #include "lwpdivinfo.hxx"
 #include "lwppara.hxx"
 #include "lwpsilverbullet.hxx"
-#include "lwptools.hxx"
+#include <lwptools.hxx>
 #include "lwpparaproperty.hxx"
-#include "xfilter/xfliststyle.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xflist.hxx"
-#include "lwpglobalmgr.hxx"
-#include "xfilter/xflistitem.hxx"
+#include <xfilter/xfliststyle.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xflist.hxx>
+#include <lwpglobalmgr.hxx>
+#include <xfilter/xflistitem.hxx>
 
 LwpBulletStyleMgr::LwpBulletStyleMgr()
     : m_pFoundry(nullptr)
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index 6fbe22d704b3..7dce7eb165c6 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -63,12 +63,12 @@
 
 #include <memory>
 
-#include "lwpheader.hxx"
-#include "lwpfoundry.hxx"
-#include "lwpobjid.hxx"
+#include <lwpheader.hxx>
+#include <lwpfoundry.hxx>
+#include <lwpobjid.hxx>
 #include "lwpnumberingoverride.hxx"
 #include <utility>
-#include "xfilter/xfcontentcontainer.hxx"
+#include <xfilter/xfcontentcontainer.hxx>
 
 class XFList;
 class LwpPara;
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index c4647943778d..504ccb366b73 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -60,19 +60,19 @@
 
 #include <memory>
 #include "lwpcelllayout.hxx"
-#include "lwpfoundry.hxx"
-#include "lwpobjfactory.hxx"
+#include <lwpfoundry.hxx>
+#include <lwpobjfactory.hxx>
 #include "lwptblcell.hxx"
 #include "lwptblformula.hxx"
 #include "lwpholder.hxx"
 #include "lwpnumericfmt.hxx"
 #include "lwptable.hxx"
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfcell.hxx"
-#include "xfilter/xfcellstyle.hxx"
-#include "xfilter/xfcolstyle.hxx"
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfcell.hxx>
+#include <xfilter/xfcellstyle.hxx>
+#include <xfilter/xfcolstyle.hxx>
 
 LwpCellLayout::LwpCellLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpMiddleLayout(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwpchangemgr.cxx b/lotuswordpro/source/filter/lwpchangemgr.cxx
index 30b272e35ccc..e08ee979869d 100644
--- a/lotuswordpro/source/filter/lwpchangemgr.cxx
+++ b/lotuswordpro/source/filter/lwpchangemgr.cxx
@@ -58,12 +58,12 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpchangemgr.hxx"
+#include <lwpchangemgr.hxx>
 #include <rtl/ustring.hxx>
 #include "lwppara.hxx"
 #include "lwpfribheader.hxx"
 #include "lwpfribptr.hxx"
-#include "lwpfrib.hxx"
+#include <lwpfrib.hxx>
 #include "lwpstory.hxx"
 #include "lwpfribsection.hxx"
 #include "lwpsection.hxx"
@@ -74,12 +74,12 @@
 #include "lwpfootnote.hxx"
 #include "lwpnotes.hxx"
 #include "lwpfribmark.hxx"
-#include "xfilter/xftextspan.hxx"
-#include "xfilter/xftextcontent.hxx"
-#include "xfilter/xftabstop.hxx"
-#include "xfilter/xflinebreak.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfhyperlink.hxx"
+#include <xfilter/xftextspan.hxx>
+#include <xfilter/xftextcontent.hxx>
+#include <xfilter/xftabstop.hxx>
+#include <xfilter/xflinebreak.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfhyperlink.hxx>
 
 LwpChangeMgr::LwpChangeMgr()
 {
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
index aa66c2899724..febc7585f7c4 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
@@ -59,15 +59,15 @@
  ************************************************************************/
 
 #include "lwpcharacterstyle.hxx"
-#include "lwpfilehdr.hxx"
-#include "lwptools.hxx"
-#include "lwpoverride.hxx"
-#include "lwpatomholder.hxx"
-#include "lwpfont.hxx"
-#include "lwpfoundry.hxx"
+#include <lwpfilehdr.hxx>
+#include <lwptools.hxx>
+#include <lwpoverride.hxx>
+#include <lwpatomholder.hxx>
+#include <lwpfont.hxx>
+#include <lwpfoundry.hxx>
 #include "lwpcharborderoverride.hxx"
-#include "xfilter/xfparastyle.hxx"
-#include "xfilter/xffont.hxx"
+#include <xfilter/xfparastyle.hxx>
+#include <xfilter/xffont.hxx>
 
 
 /*class LwpTextStyle*/
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.hxx b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
index bc2a265ac830..0b0a84ffea19 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.hxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
@@ -61,9 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARACTERSTYLE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARACTERSTYLE_HXX
 
-#include "lwpobj.hxx"
+#include <lwpobj.hxx>
 #include "lwpdlvlist.hxx"
-#include "lwpoverride.hxx"
+#include <lwpoverride.hxx>
 #include "lwpcharborderoverride.hxx"
 
 class LwpAtomHolder;
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.hxx b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
index 08c2c164809e..97b077baff8a 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARBORDEROVERRIDE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARBORDEROVERRIDE_HXX
 
-#include "lwpoverride.hxx"
+#include <lwpoverride.hxx>
 
 class LwpBorderStuff;
 class LwpMargins;
diff --git a/lotuswordpro/source/filter/lwpcharsetmgr.hxx b/lotuswordpro/source/filter/lwpcharsetmgr.hxx
index 5806a30ac8fd..c844e797e757 100644
--- a/lotuswordpro/source/filter/lwpcharsetmgr.hxx
+++ b/lotuswordpro/source/filter/lwpcharsetmgr.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARSETMGR_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARSETMGR_HXX
 
-#include "lwpfilehdr.hxx"
+#include <lwpfilehdr.hxx>
 #include <map>
 
 class LwpCharSetMgr
diff --git a/lotuswordpro/source/filter/lwpcolor.cxx b/lotuswordpro/source/filter/lwpcolor.cxx
index 1c8857b025df..fbf27a5d8c4a 100644
--- a/lotuswordpro/source/filter/lwpcolor.cxx
+++ b/lotuswordpro/source/filter/lwpcolor.cxx
@@ -58,7 +58,7 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpcolor.hxx"
+#include <lwpcolor.hxx>
 
 /**
  * @descr       return the BGR format
diff --git a/lotuswordpro/source/filter/lwpcontent.cxx b/lotuswordpro/source/filter/lwpcontent.cxx
index 85b6de3dd478..164038a1d58c 100644
--- a/lotuswordpro/source/filter/lwpcontent.cxx
+++ b/lotuswordpro/source/filter/lwpcontent.cxx
@@ -59,7 +59,7 @@
  ************************************************************************/
 
 #include "lwpstory.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpfilehdr.hxx>
 #include "lwpholder.hxx"
 
 LwpHeadContent::LwpHeadContent(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
diff --git a/lotuswordpro/source/filter/lwpcontent.hxx b/lotuswordpro/source/filter/lwpcontent.hxx
index 8b6956907b6b..4425af29a362 100644
--- a/lotuswordpro/source/filter/lwpcontent.hxx
+++ b/lotuswordpro/source/filter/lwpcontent.hxx
@@ -61,9 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCONTENT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCONTENT_HXX
 
-#include "lwpheader.hxx"
-#include "lwpobj.hxx"
-#include "lwpatomholder.hxx"
+#include <lwpheader.hxx>
+#include <lwpobj.hxx>
+#include <lwpatomholder.hxx>
 #include "lwplayout.hxx"
 #include "lwphyperlinkmgr.hxx"
 /**
diff --git a/lotuswordpro/source/filter/lwpdivinfo.cxx b/lotuswordpro/source/filter/lwpdivinfo.cxx
index 29c81935f5c1..8ff1939872e9 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.cxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.cxx
@@ -59,8 +59,8 @@
  ************************************************************************/
 
 #include "lwpdivinfo.hxx"
-#include "lwpobjstrm.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpobjstrm.hxx>
+#include <lwpfilehdr.hxx>
 #include "lwpholder.hxx"
 #include "lwppagehint.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx
index 8c18d64edbc1..d7c7aac64b3f 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.hxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.hxx
@@ -61,11 +61,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVINFO_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVINFO_HXX
 
-#include "lwpobj.hxx"
-#include "lwpobjid.hxx"
-#include "lwpatomholder.hxx"
-#include "lwpcolor.hxx"
-#include "lwpheader.hxx"
+#include <lwpobj.hxx>
+#include <lwpobjid.hxx>
+#include <lwpatomholder.hxx>
+#include <lwpcolor.hxx>
+#include <lwpheader.hxx>
 #include "lwpdoc.hxx"
 
 #define STR_OleDivisionClassName    "OLEDivision"
diff --git a/lotuswordpro/source/filter/lwpdivopts.cxx b/lotuswordpro/source/filter/lwpdivopts.cxx
index 9d8ed3d74067..bb52f28f1e2c 100644
--- a/lotuswordpro/source/filter/lwpdivopts.cxx
+++ b/lotuswordpro/source/filter/lwpdivopts.cxx
@@ -59,7 +59,7 @@
  ************************************************************************/
 
 #include "lwpdivopts.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpfilehdr.hxx>
 
 LwpHyphenOptions::LwpHyphenOptions()
     : m_nFlags(0)
diff --git a/lotuswordpro/source/filter/lwpdivopts.hxx b/lotuswordpro/source/filter/lwpdivopts.hxx
index 2c611e842d96..c2467e74e990 100644
--- a/lotuswordpro/source/filter/lwpdivopts.hxx
+++ b/lotuswordpro/source/filter/lwpdivopts.hxx
@@ -61,11 +61,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVOPTS_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVOPTS_HXX
 
-#include "lwpobj.hxx"
-#include "lwpobjid.hxx"
-#include "lwpatomholder.hxx"
-#include "lwpcolor.hxx"
-#include "lwpheader.hxx"
+#include <lwpobj.hxx>
+#include <lwpobjid.hxx>
+#include <lwpatomholder.hxx>
+#include <lwpcolor.hxx>
+#include <lwpheader.hxx>
 
 class LwpHyphenOptions
 {
diff --git a/lotuswordpro/source/filter/lwpdllist.hxx b/lotuswordpro/source/filter/lwpdllist.hxx
index 05a724ece8b7..d06495fe4821 100644
--- a/lotuswordpro/source/filter/lwpdllist.hxx
+++ b/lotuswordpro/source/filter/lwpdllist.hxx
@@ -60,7 +60,7 @@
 
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDLLIST_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDLLIST_HXX
-#include "lwpheader.hxx"
+#include <lwpheader.hxx>
 class LwpDLList
 {
 public:
diff --git a/lotuswordpro/source/filter/lwpdlvlist.cxx b/lotuswordpro/source/filter/lwpdlvlist.cxx
index 6adc1ddb4de2..e4f56e6044f2 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.cxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.cxx
@@ -59,7 +59,7 @@
  ************************************************************************/
 
 #include "lwpdlvlist.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpfilehdr.hxx>
 #include "lwpproplist.hxx"
 
 LwpDLVList::LwpDLVList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
diff --git a/lotuswordpro/source/filter/lwpdlvlist.hxx b/lotuswordpro/source/filter/lwpdlvlist.hxx
index d3c1f3c05994..f84e74a7c64b 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.hxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.hxx
@@ -61,8 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDLVLIST_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDLVLIST_HXX
 
-#include "lwpatomholder.hxx"
-#include "lwpobj.hxx"
+#include <lwpatomholder.hxx>
+#include <lwpobj.hxx>
 #include <memory>
 
 /**
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index 3b5ebcb9193c..e4755571e10d 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -53,7 +53,7 @@
  *
  *
  ************************************************************************/
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwpdoc.hxx"
 #include "lwpfootnote.hxx"
 #include "lwppagehint.hxx"
@@ -66,7 +66,7 @@
 #include "lwplayout.hxx"
 #include "lwppagelayout.hxx"
 #include "lwpverdocument.hxx"
-#include "xfilter/xfstylemanager.hxx"
+#include <xfilter/xfstylemanager.hxx>
 #include <osl/thread.h>
 
 LwpDocument::LwpDocument(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx
index fe8dc80e95cb..a0d12105a645 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -61,15 +61,15 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDOC_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDOC_HXX
 
-#include "lwpobj.hxx"
+#include <lwpobj.hxx>
 #include "lwpsortopt.hxx"
 #include "lwpuidoc.hxx"
 #include "lwplnopts.hxx"
 #include "lwpusrdicts.hxx"
 #include "lwpprtinfo.hxx"
 #include "lwpdlvlist.hxx"
-#include "lwpheader.hxx"
-#include "lwpfoundry.hxx"
+#include <lwpheader.hxx>
+#include <lwpfoundry.hxx>
 
 class IXFStream;
 class LwpVirtualLayout;
diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx
index 6a0c50ca941c..6fdd64c131ca 100644
--- a/lotuswordpro/source/filter/lwpdocdata.cxx
+++ b/lotuswordpro/source/filter/lwpdocdata.cxx
@@ -54,12 +54,12 @@
  *
  ************************************************************************/
 #include <memory>
-#include "lwpdocdata.hxx"
-#include "xfilter/xfofficemeta.hxx"
-#include "localtime.hxx"
+#include <lwpdocdata.hxx>
+#include <xfilter/xfofficemeta.hxx>
+#include <localtime.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "lwpfilehdr.hxx"
-#include "lwpglobalmgr.hxx"
+#include <lwpfilehdr.hxx>
+#include <lwpglobalmgr.hxx>
 
 LwpDocData::LwpDocData(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     :LwpObject(objHdr, pStrm)//m_pEditorAttrList(0)
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 7d349351fb71..e10a5e985f2c 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -59,28 +59,28 @@
  *  and so on.
  */
 #include <osl/thread.h>
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwpdrawobj.hxx"
-#include "lwptools.hxx"
+#include <lwptools.hxx>
 #include <tools/stream.hxx>
 
-#include "xfilter/xfframe.hxx"
-
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfdrawstyle.hxx"
-#include "xfilter/xftextstyle.hxx"
-#include "xfilter/xfparastyle.hxx"
-#include "xfilter/xfimagestyle.hxx"
-#include "xfilter/xftextboxstyle.hxx"
-#include "xfilter/xfparagraph.hxx"
-#include "xfilter/xftextspan.hxx"
-#include "xfilter/xffont.hxx"
-
-#include "xfilter/xfdrawrect.hxx"
-#include "xfilter/xfdrawpath.hxx"
-#include "xfilter/xfdrawline.hxx"
-#include "xfilter/xfdrawpolygon.hxx"
-#include "xfilter/xfimage.hxx"
+#include <xfilter/xfframe.hxx>
+
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfdrawstyle.hxx>
+#include <xfilter/xftextstyle.hxx>
+#include <xfilter/xfparastyle.hxx>
+#include <xfilter/xfimagestyle.hxx>
+#include <xfilter/xftextboxstyle.hxx>
+#include <xfilter/xfparagraph.hxx>
+#include <xfilter/xftextspan.hxx>
+#include <xfilter/xffont.hxx>
+
+#include <xfilter/xfdrawrect.hxx>
+#include <xfilter/xfdrawpath.hxx>
+#include <xfilter/xfdrawline.hxx>
+#include <xfilter/xfdrawpolygon.hxx>
+#include <xfilter/xfimage.hxx>
 
 #include "lwpcharsetmgr.hxx"
 #include "lwpsdwrect.hxx"
diff --git a/lotuswordpro/source/filter/lwpdropcapmgr.cxx b/lotuswordpro/source/filter/lwpdropcapmgr.cxx
index d0afe6ed1eda..f091e771456a 100644
--- a/lotuswordpro/source/filter/lwpdropcapmgr.cxx
+++ b/lotuswordpro/source/filter/lwpdropcapmgr.cxx
@@ -58,7 +58,7 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpdropcapmgr.hxx"
+#include <lwpdropcapmgr.hxx>
 
 LwpDropcapMgr::LwpDropcapMgr()
 {
diff --git a/lotuswordpro/source/filter/lwpfilehdr.cxx b/lotuswordpro/source/filter/lwpfilehdr.cxx
index edac5fa31c11..eea66bf22c83 100644
--- a/lotuswordpro/source/filter/lwpfilehdr.cxx
+++ b/lotuswordpro/source/filter/lwpfilehdr.cxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#include "lwpfilehdr.hxx"
-#include "lwpdefs.hxx"
+#include <lwpfilehdr.hxx>
+#include <lwpdefs.hxx>
 
 //Word Pro 96: 0x0a,
 sal_uInt16 LwpFileHeader::m_nFileRevision = 0;
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 11e7ea6bf470..3b37ac1d9e94 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -59,11 +59,11 @@
  ************************************************************************/
 #include "lwpfilter.hxx"
 #include "lwpresource.hxx"
-#include "xfilter/xfsaxstream.hxx"
+#include <xfilter/xfsaxstream.hxx>
 #include "lwp9reader.hxx"
-#include "lwpsvstream.hxx"
-#include "xfilter/xffontfactory.hxx"
-#include "xfilter/xfstylemanager.hxx"
+#include <lwpsvstream.hxx>
+#include <xfilter/xffontfactory.hxx>
+#include <xfilter/xfstylemanager.hxx>
 
 #include <osl/file.h>
 #include <osl/file.hxx>
diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index bc97ed8b276e..a192a8ed55e0 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -53,13 +53,13 @@
  *
  *
  ************************************************************************/
-#include "lwpglobalmgr.hxx"
-#include "lwpfont.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xffontfactory.hxx"
-#include "xfilter/xftextstyle.hxx"
-#include "xfilter/xfdefs.hxx"
-#include "xfilter/xfcolor.hxx"
+#include <lwpglobalmgr.hxx>
+#include <lwpfont.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xffontfactory.hxx>
+#include <xfilter/xftextstyle.hxx>
+#include <xfilter/xfdefs.hxx>
+#include <xfilter/xfcolor.hxx>
 
 void LwpFontAttrEntry::Read(LwpObjectStream *pStrm)
 {
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx
index 23a72f24dad4..53502aa18663 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -57,16 +57,16 @@
 #include <memory>
 #include "lwpfootnote.hxx"
 #include "lwpstory.hxx"
-#include "xfilter/xffootnote.hxx"
-#include "xfilter/xfendnote.hxx"
-#include "xfilter/xffootnoteconfig.hxx"
-#include "xfilter/xfendnoteconfig.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xftextspan.hxx"
+#include <xfilter/xffootnote.hxx>
+#include <xfilter/xfendnote.hxx>
+#include <xfilter/xffootnoteconfig.hxx>
+#include <xfilter/xfendnoteconfig.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xftextspan.hxx>
 #include "lwppara.hxx"
 #include "lwpdoc.hxx"
 #include "lwpfnlayout.hxx"
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 
 LwpFribFootnote::LwpFribFootnote(LwpPara* pPara ):LwpFrib(pPara)
 {
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx
index 1857489f0410..40ee2a9edd92 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -61,8 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFOOTNOTE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFOOTNOTE_HXX
 
-#include "lwpfrib.hxx"
-#include "lwpobj.hxx"
+#include <lwpfrib.hxx>
+#include <lwpobj.hxx>
 #include "lwpsection.hxx"
 #include "lwpborderstuff.hxx"
 #include "lwptable.hxx"
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx
index f41acfcf9b5a..5f19f8269e51 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpfoundry.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpfoundry.hxx>
+#include <lwpfilehdr.hxx>
 #include "lwpdoc.hxx"
 #include "lwpmarker.hxx"
 #include "lwpholder.hxx"
@@ -68,8 +68,8 @@
 #include "lwpvpointer.hxx"
 #include "lwpsection.hxx"
 #include "lwpcharacterstyle.hxx"
-#include "lwpglobalmgr.hxx"
-#include "xfilter/xfstylemanager.hxx"
+#include <lwpglobalmgr.hxx>
+#include <xfilter/xfstylemanager.hxx>
 #include "lwplayout.hxx"
 
 #include <osl/diagnose.h>
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index e2cb4fa84611..645a16602709 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -61,15 +61,15 @@
 #include <memory>
 #include "lwpframelayout.hxx"
 #include "lwppara.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfparagraph.hxx"
-#include "xfilter/xffloatframe.hxx"
-#include "xfilter/xfrubystyle.hxx"
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfparagraph.hxx>
+#include <xfilter/xffloatframe.hxx>
+#include <xfilter/xfrubystyle.hxx>
 #include "lwppagelayout.hxx"
 #include "lwpoleobject.hxx"
 #include "lwptablelayout.hxx"
 #include "lwpgrfobj.hxx"
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 
 LwpFrame::LwpFrame(LwpPlacableLayout* pLayout):m_pLayout(pLayout)
 {
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index bd951118d48d..f9b3ad759d3c 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -59,16 +59,16 @@
  ************************************************************************/
 
 #include <memory>
-#include "lwpfrib.hxx"
+#include <lwpfrib.hxx>
 #include "lwpcharsetmgr.hxx"
 #include "lwpsection.hxx"
 #include "lwphyperlinkmgr.hxx"
-#include "xfilter/xfhyperlink.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfsection.hxx"
-#include "xfilter/xfsectionstyle.hxx"
-#include "xfilter/xftextspan.hxx"
-#include "xfilter/xftextcontent.hxx"
+#include <xfilter/xfhyperlink.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfsection.hxx>
+#include <xfilter/xfsectionstyle.hxx>
+#include <xfilter/xftextspan.hxx>
+#include <xfilter/xftextcontent.hxx>
 #include "lwpfribheader.hxx"
 #include "lwpfribtext.hxx"
 #include "lwpfribtable.hxx"
@@ -79,9 +79,9 @@
 #include "lwpfootnote.hxx"
 #include "lwpnotes.hxx"
 #include "lwpfribmark.hxx"
-#include "lwpchangemgr.hxx"
-#include "lwpdocdata.hxx"
-#include "lwpglobalmgr.hxx"
+#include <lwpchangemgr.hxx>
+#include <lwpdocdata.hxx>
+#include <lwpglobalmgr.hxx>
 
 #include <osl/diagnose.h>
 
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.cxx b/lotuswordpro/source/filter/lwpfribbreaks.cxx
index 6538d68cbc76..ee3f90c35129 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.cxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.cxx
@@ -60,11 +60,11 @@
 
 #include "lwpfribbreaks.hxx"
 #include "lwpstory.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfsectionstyle.hxx"
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfsectionstyle.hxx>
 #include "lwpsection.hxx"
-#include "xfilter/xfsection.hxx"
-#include "lwpglobalmgr.hxx"
+#include <xfilter/xfsection.hxx>
+#include <lwpglobalmgr.hxx>
 
 void LwpFribColumnBreak::RegisterBreakStyle(LwpPara * pPara)
 {
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.hxx b/lotuswordpro/source/filter/lwpfribbreaks.hxx
index 59dbfbc83392..bb4f42e01859 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.hxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.hxx
@@ -61,8 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBBREAKS_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBBREAKS_HXX
 
-#include "lwpfrib.hxx"
-#include "xfilter/xfparastyle.hxx"
+#include <lwpfrib.hxx>
+#include <xfilter/xfparastyle.hxx>
 #include "lwppara.hxx"
 #include "lwpfribsection.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpfribframe.cxx b/lotuswordpro/source/filter/lwpfribframe.cxx
index 06a7179160c0..5b44dbd5aefd 100644
--- a/lotuswordpro/source/filter/lwpfribframe.cxx
+++ b/lotuswordpro/source/filter/lwpfribframe.cxx
@@ -59,9 +59,9 @@
  */
 
 #include "lwpfribframe.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "lwpglobalmgr.hxx"
-#include "xfilter/xfchange.hxx"
+#include <xfilter/xfstylemanager.hxx>
+#include <lwpglobalmgr.hxx>
+#include <xfilter/xfchange.hxx>
 /**
  * @short:   Read frame frib
  */
diff --git a/lotuswordpro/source/filter/lwpfribframe.hxx b/lotuswordpro/source/filter/lwpfribframe.hxx
index a4a43341ab30..6334af37a212 100644
--- a/lotuswordpro/source/filter/lwpfribframe.hxx
+++ b/lotuswordpro/source/filter/lwpfribframe.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBFRAME_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBFRAME_HXX
 
-#include "lwpfrib.hxx"
+#include <lwpfrib.hxx>
 #include "lwplayout.hxx"
 #include "lwppara.hxx"
 #include "lwpframelayout.hxx"
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index 6c5ce34e8a20..fb5fe1e3fcac 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -59,23 +59,23 @@
  ************************************************************************/
 
 #include "lwpfribmark.hxx"
-#include "lwptools.hxx"
-#include "lwpglobalmgr.hxx"
+#include <lwptools.hxx>
+#include <lwpglobalmgr.hxx>
 #include "lwpdoc.hxx"
 #include "lwpdivinfo.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xftextspan.hxx"
-#include "xfilter/xfbookmark.hxx"
-#include "xfilter/xfentry.hxx"
-#include "xfilter/xftextcontent.hxx"
-#include "xfilter/xfcrossref.hxx"
-#include "xfilter/xfdocfield.hxx"
-#include "xfilter/xfdatestyle.hxx"
-#include "xfilter/xftimestyle.hxx"
-#include "xfilter/xfdate.hxx"
-#include "xfilter/xfruby.hxx"
-#include "lwpchangemgr.hxx"
-#include "xfilter/xfchange.hxx"
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xftextspan.hxx>
+#include <xfilter/xfbookmark.hxx>
+#include <xfilter/xfentry.hxx>
+#include <xfilter/xftextcontent.hxx>
+#include <xfilter/xfcrossref.hxx>
+#include <xfilter/xfdocfield.hxx>
+#include <xfilter/xfdatestyle.hxx>
+#include <xfilter/xftimestyle.hxx>
+#include <xfilter/xfdate.hxx>
+#include <xfilter/xfruby.hxx>
+#include <lwpchangemgr.hxx>
+#include <xfilter/xfchange.hxx>
 
 /**
  * @short:   Read hyperlink frib and Click here block
diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx
index 45f7aeef6288..de18460a6137 100644
--- a/lotuswordpro/source/filter/lwpfribmark.hxx
+++ b/lotuswordpro/source/filter/lwpfribmark.hxx
@@ -61,11 +61,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBMARK_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBMARK_HXX
 
-#include "lwpfrib.hxx"
+#include <lwpfrib.hxx>
 #include "lwpstory.hxx"
 #include "lwpmarker.hxx"
-#include "xfilter/xftextspan.hxx"
-#include "xfilter/xfbookmark.hxx"
+#include <xfilter/xftextspan.hxx>
+#include <xfilter/xfbookmark.hxx>
 
 class LwpFribCHBlock : public LwpFrib
 {
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index 604408e82fb1..2e17818f03e3 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -64,25 +64,25 @@
 #include "lwpfribtext.hxx"
 #include "lwppara.hxx"
 #include "lwpstory.hxx"
-#include "xfilter/xftextspan.hxx"
-#include "xfilter/xftextcontent.hxx"
-#include "xfilter/xftabstop.hxx"
-#include "xfilter/xflinebreak.hxx"
+#include <xfilter/xftextspan.hxx>
+#include <xfilter/xftextcontent.hxx>
+#include <xfilter/xftabstop.hxx>
+#include <xfilter/xflinebreak.hxx>
 #include "lwpfribsection.hxx"
 #include "lwpsection.hxx"
 #include "lwpfribbreaks.hxx"
 #include "lwpfribframe.hxx"
 #include "lwpfribtable.hxx"
-#include "xfilter/xfstylemanager.hxx"
+#include <xfilter/xfstylemanager.hxx>
 #include "lwphyperlinkmgr.hxx"
-#include "xfilter/xfhyperlink.hxx"
+#include <xfilter/xfhyperlink.hxx>
 #include "lwpfootnote.hxx"
 #include "lwpnotes.hxx"
 #include "lwpfribmark.hxx"
-#include "xfilter/xfchange.hxx"
-#include "lwpchangemgr.hxx"
-#include "lwpglobalmgr.hxx"
-#include "lwpdropcapmgr.hxx"
+#include <xfilter/xfchange.hxx>
+#include <lwpchangemgr.hxx>
+#include <lwpglobalmgr.hxx>
+#include <lwpdropcapmgr.hxx>
 
 LwpFribPtr::LwpFribPtr()
     : m_pFribs(nullptr),m_pXFPara(nullptr),m_pPara(nullptr)
diff --git a/lotuswordpro/source/filter/lwpfribptr.hxx b/lotuswordpro/source/filter/lwpfribptr.hxx
index d70878783dbb..de77b34e71a7 100644
--- a/lotuswordpro/source/filter/lwpfribptr.hxx
+++ b/lotuswordpro/source/filter/lwpfribptr.hxx
@@ -61,10 +61,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBPTR_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBPTR_HXX
 
-#include "lwpobjstrm.hxx"
-#include "lwpfrib.hxx"
+#include <lwpobjstrm.hxx>
+#include <lwpfrib.hxx>
 #include "lwpstory.hxx"
-#include "xfilter/xfparagraph.hxx"
+#include <xfilter/xfparagraph.hxx>
 
 class LwpPara;
 class LwpFribPtr
diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx
index d6518db53026..7c64bb2e0068 100644
--- a/lotuswordpro/source/filter/lwpfribsection.cxx
+++ b/lotuswordpro/source/filter/lwpfribsection.cxx
@@ -62,12 +62,12 @@
 #include "lwpfribbreaks.hxx"
 #include "lwpstory.hxx"
 #include "lwpsection.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfsectionstyle.hxx"
-#include "xfilter/xfsection.hxx"
-#include "xfilter/xfindex.hxx"
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfsectionstyle.hxx>
+#include <xfilter/xfsection.hxx>
+#include <xfilter/xfindex.hxx>
 #include "lwpfribptr.hxx"
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 
 LwpFribSection::LwpFribSection(LwpPara *pPara)
      : LwpFrib(pPara),m_pMasterPage(nullptr)
diff --git a/lotuswordpro/source/filter/lwpfribsection.hxx b/lotuswordpro/source/filter/lwpfribsection.hxx
index 60a5de906e4e..ce4ac2531e88 100644
--- a/lotuswordpro/source/filter/lwpfribsection.hxx
+++ b/lotuswordpro/source/filter/lwpfribsection.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBSECTION_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBSECTION_HXX
 
-#include "lwpfrib.hxx"
+#include <lwpfrib.hxx>
 #include "lwppara.hxx"
 
 /**
diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx b/lotuswordpro/source/filter/lwpfribtable.cxx
index 2be46311f52a..67135fff4603 100644
--- a/lotuswordpro/source/filter/lwpfribtable.cxx
+++ b/lotuswordpro/source/filter/lwpfribtable.cxx
@@ -57,10 +57,10 @@
 #include "lwpfribtable.hxx"
 #include "lwppara.hxx"
 #include "lwptablelayout.hxx"
-#include "lwpchangemgr.hxx"
-#include "lwpglobalmgr.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfchange.hxx"
+#include <lwpchangemgr.hxx>
+#include <lwpglobalmgr.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfchange.hxx>
 
 /**
  * @short:   Read table frib
diff --git a/lotuswordpro/source/filter/lwpfribtable.hxx b/lotuswordpro/source/filter/lwpfribtable.hxx
index a810b8815ae2..cdc62744cb6a 100644
--- a/lotuswordpro/source/filter/lwpfribtable.hxx
+++ b/lotuswordpro/source/filter/lwpfribtable.hxx
@@ -56,7 +56,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBTABLE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBTABLE_HXX
 
-#include "lwpfrib.hxx"
+#include <lwpfrib.hxx>
 
 class LwpSuperTableLayout;
 class LwpFribTable : public LwpFrib
diff --git a/lotuswordpro/source/filter/lwpfribtext.cxx b/lotuswordpro/source/filter/lwpfribtext.cxx
index b7b6a2ffbe46..3aae5d61d9fc 100644
--- a/lotuswordpro/source/filter/lwpfribtext.cxx
+++ b/lotuswordpro/source/filter/lwpfribtext.cxx
@@ -58,23 +58,23 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwpfribtext.hxx"
 #include "lwpcharsetmgr.hxx"
 #include "lwphyperlinkmgr.hxx"
-#include "lwptools.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xftextspan.hxx"
-#include "xfilter/xfbookmark.hxx"
-#include "xfilter/xfentry.hxx"
-#include "xfilter/xftextcontent.hxx"
-#include "xfilter/xfcrossref.hxx"
-#include "xfilter/xfpagenumber.hxx"
-#include "xfilter/xfdocfield.hxx"
-#include "xfilter/xfdatestyle.hxx"
-#include "xfilter/xftimestyle.hxx"
-#include "xfilter/xfdate.hxx"
-#include "xfilter/xfannotation.hxx"
+#include <lwptools.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xftextspan.hxx>
+#include <xfilter/xfbookmark.hxx>
+#include <xfilter/xfentry.hxx>
+#include <xfilter/xftextcontent.hxx>
+#include <xfilter/xfcrossref.hxx>
+#include <xfilter/xfpagenumber.hxx>
+#include <xfilter/xfdocfield.hxx>
+#include <xfilter/xfdatestyle.hxx>
+#include <xfilter/xftimestyle.hxx>
+#include <xfilter/xfdate.hxx>
+#include <xfilter/xfannotation.hxx>
 
 LwpFribText::LwpFribText( LwpPara *pPara, bool bNoUnicode )
     : LwpFrib(pPara), m_bNoUnicode(bNoUnicode)
diff --git a/lotuswordpro/source/filter/lwpfribtext.hxx b/lotuswordpro/source/filter/lwpfribtext.hxx
index 79566424029c..1a7147c348b1 100644
--- a/lotuswordpro/source/filter/lwpfribtext.hxx
+++ b/lotuswordpro/source/filter/lwpfribtext.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBTEXT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBTEXT_HXX
 
-#include "lwpfrib.hxx"
+#include <lwpfrib.hxx>
 #include "lwpstory.hxx"
 class LwpFribText : public LwpFrib
 {
diff --git a/lotuswordpro/source/filter/lwpglobalmgr.cxx b/lotuswordpro/source/filter/lwpglobalmgr.cxx
index a8ad1469b430..94eec192a7c0 100644
--- a/lotuswordpro/source/filter/lwpglobalmgr.cxx
+++ b/lotuswordpro/source/filter/lwpglobalmgr.cxx
@@ -53,7 +53,7 @@
  *
  *
  ************************************************************************/
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include <osl/thread.hxx>
 std::map< sal_uInt32,LwpGlobalMgr* > LwpGlobalMgr::m_ThreadMap;
 LwpGlobalMgr::LwpGlobalMgr(LwpSvStream* pSvStream)
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 55db2b3fb73c..4d596c82dd3e 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -67,18 +67,18 @@
 #include "lwpsdwfileloader.hxx"
 #include "bento.hxx"
 
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwpframelayout.hxx"
 
-#include "xfilter/xfframe.hxx"
-#include "xfilter/xfimage.hxx"
-#include "xfilter/xfimagestyle.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfparagraph.hxx"
-#include "xfilter/xfannotation.hxx"
+#include <xfilter/xfframe.hxx>
+#include <xfilter/xfimage.hxx>
+#include <xfilter/xfimagestyle.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfparagraph.hxx>
+#include <xfilter/xfannotation.hxx>
 
 //For chart
-#include "string.h"
+#include <string.h>
 
 #include <osl/thread.h>
 
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx
index bfe771c61684..03d017a74a4d 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -64,8 +64,8 @@
 #include <sal/types.h>
 
 #include "lwpoleobject.hxx"
-#include "lwpheader.hxx"
-#include "xfilter/xfrect.hxx"
+#include <lwpheader.hxx>
+#include <xfilter/xfrect.hxx>
 
 struct ImageProcessingData
 {
diff --git a/lotuswordpro/source/filter/lwpholder.cxx b/lotuswordpro/source/filter/lwpholder.cxx
index 1d46fd81a4b0..7d6c7f415235 100644
--- a/lotuswordpro/source/filter/lwpholder.cxx
+++ b/lotuswordpro/source/filter/lwpholder.cxx
@@ -59,7 +59,7 @@
  ************************************************************************/
 
 #include "lwpholder.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpfilehdr.hxx>
 
 LwpDLVListHeadHolder::LwpDLVListHeadHolder(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwpholder.hxx b/lotuswordpro/source/filter/lwpholder.hxx
index f9f1065073ae..6f36b2ddb381 100644
--- a/lotuswordpro/source/filter/lwpholder.hxx
+++ b/lotuswordpro/source/filter/lwpholder.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHOLDER_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHOLDER_HXX
 
-#include "lwpobj.hxx"
+#include <lwpobj.hxx>
 #include "lwpdlvlist.hxx"
 /**
  * @brief   VO_HEADHOLDER, LwpDLVListHeadHolder,
diff --git a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
index 28c735569905..a0afad55240a 100644
--- a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
+++ b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHYPERLINKMGR_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHYPERLINKMGR_HXX
 
-#include "lwpfilehdr.hxx"
+#include <lwpfilehdr.hxx>
 
 class LwpHyperlinkMgr
 {
diff --git a/lotuswordpro/source/filter/lwpidxmgr.cxx b/lotuswordpro/source/filter/lwpidxmgr.cxx
index df8419c7e431..6eac6d47becc 100644
--- a/lotuswordpro/source/filter/lwpidxmgr.cxx
+++ b/lotuswordpro/source/filter/lwpidxmgr.cxx
@@ -66,8 +66,8 @@
 
 **********************************************************************************************************************/
 
-#include "lwpidxmgr.hxx"
-#include "lwptools.hxx"
+#include <lwpidxmgr.hxx>
+#include <lwptools.hxx>
 #include <memory>
 
 const sal_uInt8 LwpIndexManager::MAXOBJECTIDS = 255;
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 3880d7e8afbf..34ae225a3920 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -61,9 +61,9 @@
 #include <memory>
 #include "lwplayout.hxx"
 #include "lwpusewhen.hxx"
-#include "lwptools.hxx"
+#include <lwptools.hxx>
 #include "lwplaypiece.hxx"
-#include "xfilter/xfcolumns.hxx"
+#include <xfilter/xfcolumns.hxx>
 #include "lwpstory.hxx"
 #include "lwpparastyle.hxx"
 #include "lwpholder.hxx"
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 349fa7818f83..599dc22359c2 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -66,23 +66,23 @@
 
 #include <rtl/ref.hxx>
 
-#include "lwpheader.hxx"
-#include "lwpobj.hxx"
-#include "lwpobjhdr.hxx"
-#include "lwpobjstrm.hxx"
-#include "lwpobjid.hxx"
+#include <lwpheader.hxx>
+#include <lwpobj.hxx>
+#include <lwpobjhdr.hxx>
+#include <lwpobjstrm.hxx>
+#include <lwpobjid.hxx>
 #include "lwpdlvlist.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpfilehdr.hxx>
 
 #include "lwplayoutdef.hxx"
-#include "xfilter/xfdefs.hxx"
-#include "xfilter/xffont.hxx"
-#include "xfilter/xfpagemaster.hxx"
-#include "xfilter/xfcolumns.hxx"
-#include "xfilter/xfborders.hxx"
-#include "xfilter/xfframestyle.hxx"
-#include "xfilter/xfframe.hxx"
-#include "xfilter/xfbgimage.hxx"
+#include <xfilter/xfdefs.hxx>
+#include <xfilter/xffont.hxx>
+#include <xfilter/xfpagemaster.hxx>
+#include <xfilter/xfcolumns.hxx>
+#include <xfilter/xfborders.hxx>
+#include <xfilter/xfframestyle.hxx>
+#include <xfilter/xfframe.hxx>
+#include <xfilter/xfbgimage.hxx>
 #include "lwpusewhen.hxx"
 #include "lwplaypiece.hxx"
 
diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx b/lotuswordpro/source/filter/lwplaypiece.cxx
index fcc7a8aa1f4c..27be301fa3e9 100644
--- a/lotuswordpro/source/filter/lwplaypiece.cxx
+++ b/lotuswordpro/source/filter/lwplaypiece.cxx
@@ -60,7 +60,7 @@
 
 #include "lwplaypiece.hxx"
 #include "lwpstyledef.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpfilehdr.hxx>
 
 
 LwpRotor::LwpRotor()
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index 2f028d57c8f6..688b388d10f8 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -62,7 +62,7 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLAYPIECE_HXX
 
 #include "lwppiece.hxx"
-#include "lwpbasetype.hxx"
+#include <lwpbasetype.hxx>
 #include "lwpmargins.hxx"
 #include "lwpborderstuff.hxx"
 #include "lwpshadow.hxx"
diff --git a/lotuswordpro/source/filter/lwplnopts.cxx b/lotuswordpro/source/filter/lwplnopts.cxx
index d177951747bf..f06774ad184b 100644
--- a/lotuswordpro/source/filter/lwplnopts.cxx
+++ b/lotuswordpro/source/filter/lwplnopts.cxx
@@ -53,7 +53,7 @@
  *
  *
  ************************************************************************/
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwplnopts.hxx"
 
 LwpLineNumberOptions::LwpLineNumberOptions(LwpObjectStream* pStrm)
diff --git a/lotuswordpro/source/filter/lwplnopts.hxx b/lotuswordpro/source/filter/lwplnopts.hxx
index 6ef1e69e2288..22959d83c26b 100644
--- a/lotuswordpro/source/filter/lwplnopts.hxx
+++ b/lotuswordpro/source/filter/lwplnopts.hxx
@@ -61,10 +61,10 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLNOPTS_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLNOPTS_HXX
 
-#include "lwpobjstrm.hxx"
-#include "lwptools.hxx"
-#include "xfilter/xflinenumberconfig.hxx"
-#include "xfilter/xfstylemanager.hxx"
+#include <lwpobjstrm.hxx>
+#include <lwptools.hxx>
+#include <xfilter/xflinenumberconfig.hxx>
+#include <xfilter/xfstylemanager.hxx>
 /**
  * @brief   line number options
 */
diff --git a/lotuswordpro/source/filter/lwpmargins.hxx b/lotuswordpro/source/filter/lwpmargins.hxx
index eb3e8617cf75..7095b3b81f20 100644
--- a/lotuswordpro/source/filter/lwpmargins.hxx
+++ b/lotuswordpro/source/filter/lwpmargins.hxx
@@ -57,8 +57,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPMARGINS_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPMARGINS_HXX
 
-#include "lwpobjstrm.hxx"
-#include "lwptools.hxx"
+#include <lwpobjstrm.hxx>
+#include <lwptools.hxx>
 
 const sal_uInt8 MARGIN_LEFT = 0;
 const sal_uInt8 MARGIN_RIGHT = 1;
diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx
index 1c83c150f587..6ed37718db38 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -58,14 +58,14 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpfoundry.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpfoundry.hxx>
+#include <lwpfilehdr.hxx>
 #include "lwpstory.hxx"
 #include "lwpmarker.hxx"
 #include "lwpproplist.hxx"
-#include "lwpglobalmgr.hxx"
-#include "xfilter/xfplaceholder.hxx"
-#include "xfilter/xfinputlist.hxx"
+#include <lwpglobalmgr.hxx>
+#include <xfilter/xfplaceholder.hxx>
+#include <xfilter/xfinputlist.hxx>
 
 LwpMarker::LwpMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpDLNFPVList(objHdr,pStrm)
diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx
index acea7b387c9c..cb01ed70b8eb 100644
--- a/lotuswordpro/source/filter/lwpmarker.hxx
+++ b/lotuswordpro/source/filter/lwpmarker.hxx
@@ -61,11 +61,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPMARKER_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPMARKER_HXX
 
-#include "lwpobj.hxx"
-#include "lwpobjid.hxx"
+#include <lwpobj.hxx>
+#include <lwpobjid.hxx>
 #include "lwpdlvlist.hxx"
-#include "lwpfrib.hxx"
-#include "xfilter/xftextspan.hxx"
+#include <lwpfrib.hxx>
+#include <xfilter/xftextspan.hxx>
 
 class LwpMarker : public LwpDLNFPVList
 {
diff --git a/lotuswordpro/source/filter/lwpnotes.cxx b/lotuswordpro/source/filter/lwpnotes.cxx
index 00efaa4c91f1..dba6ea0da974 100644
--- a/lotuswordpro/source/filter/lwpnotes.cxx
+++ b/lotuswordpro/source/filter/lwpnotes.cxx
@@ -60,10 +60,10 @@
 
 #include "lwpnotes.hxx"
 #include "lwppara.hxx"
-#include "xfilter/xfannotation.hxx"
-#include "xfilter/xftextspan.hxx"
-#include "localtime.hxx"
-#include "lwptools.hxx"
+#include <xfilter/xfannotation.hxx>
+#include <xfilter/xftextspan.hxx>
+#include <localtime.hxx>
+#include <lwptools.hxx>
 
  LwpFribNote::LwpFribNote(LwpPara* pPara ):LwpFrib(pPara)
 {
diff --git a/lotuswordpro/source/filter/lwpnotes.hxx b/lotuswordpro/source/filter/lwpnotes.hxx
index b85102ecfc2b..4576f2bcc1c6 100644
--- a/lotuswordpro/source/filter/lwpnotes.hxx
+++ b/lotuswordpro/source/filter/lwpnotes.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNOTES_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNOTES_HXX
 
-#include "lwpfrib.hxx"
+#include <lwpfrib.hxx>
 #include "lwpframelayout.hxx"
 
 /**
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.cxx b/lotuswordpro/source/filter/lwpnumberingoverride.cxx
index 362b9fef63b0..ae8de9dc9833 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.cxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.cxx
@@ -59,7 +59,7 @@
 ************************************************************************/
 
 #include "lwpnumberingoverride.hxx"
-#include "lwpobjstrm.hxx"
+#include <lwpobjstrm.hxx>
 
 LwpNumberingOverride::LwpNumberingOverride()
 {
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
index ffbfb18def67..7fe2afb0dce7 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNUMBERINGOVERRIDE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNUMBERINGOVERRIDE_HXX
 
-#include "lwpoverride.hxx"
+#include <lwpoverride.hxx>
 
 class LwpObjectStream;
 class LwpNumberingOverride : public LwpOverride
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index 592a93541c54..2dc55fe2919d 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -61,13 +61,13 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNUMERICFMT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNUMERICFMT_HXX
 
-#include "lwpatomholder.hxx"
+#include <lwpatomholder.hxx>
 #include "lwptblcell.hxx"
-#include "lwpcolor.hxx"
+#include <lwpcolor.hxx>
 #include "lwppiece.hxx"
 
 //For converting to xml
-#include "xfilter/xfnumberstyle.hxx"
+#include <xfilter/xfnumberstyle.hxx>
 
 class LwpObjectStream;
 
diff --git a/lotuswordpro/source/filter/lwpobj.cxx b/lotuswordpro/source/filter/lwpobj.cxx
index efca68d95e77..f7395cb0611e 100644
--- a/lotuswordpro/source/filter/lwpobj.cxx
+++ b/lotuswordpro/source/filter/lwpobj.cxx
@@ -54,7 +54,7 @@
  *
  ************************************************************************/
 
-#include "lwpobj.hxx"
+#include <lwpobj.hxx>
 
 /**
  * @descr  construct lwpobject from stream
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index 48b370350c21..0f598c189b63 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpobjfactory.hxx"
-#include "lwpdefs.hxx"
+#include <lwpobjfactory.hxx>
+#include <lwpdefs.hxx>
 #include "lwpdoc.hxx"
 #include "lwpstory.hxx"
 #include "lwplayout.hxx"
@@ -91,7 +91,7 @@
 #include "lwpnumericfmt.hxx"
 #include "lwpfnlayout.hxx"
 #include "lwptoc.hxx"
-#include "lwpdocdata.hxx"
+#include <lwpdocdata.hxx>
 #include "lwpnotes.hxx"
 #include "lwpverdocument.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpobjhdr.cxx b/lotuswordpro/source/filter/lwpobjhdr.cxx
index 844cdf2a9c62..bf13cfded8c6 100644
--- a/lotuswordpro/source/filter/lwpobjhdr.cxx
+++ b/lotuswordpro/source/filter/lwpobjhdr.cxx
@@ -58,9 +58,9 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpobjhdr.hxx"
-#include "lwpdefs.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpobjhdr.hxx>
+#include <lwpdefs.hxx>
+#include <lwpfilehdr.hxx>
 
 LwpObjectHeader::LwpObjectHeader()
     : m_nTag(0), m_ID(), m_nSize(0), m_bCompressed(false)
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index 2cfc9148f373..3a7d71b51be0 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -58,10 +58,10 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpobjid.hxx"
-#include "lwpfilehdr.hxx"
-#include "lwpobjfactory.hxx"
-#include "lwpglobalmgr.hxx"
+#include <lwpobjid.hxx>
+#include <lwpfilehdr.hxx>
+#include <lwpobjfactory.hxx>
+#include <lwpglobalmgr.hxx>
 
 LwpObjectID::LwpObjectID()
     :m_nLow(0), m_nHigh(0), m_nIndex(0), m_bIsCompressed(false)
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx
index f199fe1d2847..a3a974211b13 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -54,8 +54,8 @@
  *
  ************************************************************************/
 
-#include "lwpobjstrm.hxx"
-#include "lwptools.hxx"
+#include <lwpobjstrm.hxx>
+#include <lwptools.hxx>
 
 #include <sal/types.h>
 #include <tools/solar.h>
diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx b/lotuswordpro/source/filter/lwpoleobject.cxx
index 85e3a33b2525..1e0a00e54e77 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -59,14 +59,14 @@
  */
 
 #include <tools/stream.hxx>
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwpoleobject.hxx"
-#include "lwpobjfactory.hxx"
-#include "lwpidxmgr.hxx"
+#include <lwpobjfactory.hxx>
+#include <lwpidxmgr.hxx>
 #include "lwp9reader.hxx"
-#include "xfilter/xfparagraph.hxx"
+#include <xfilter/xfparagraph.hxx>
 #include "lwpframelayout.hxx"
-#include "xfilter/xfstylemanager.hxx"
+#include <xfilter/xfstylemanager.hxx>
 #include "bento.hxx"
 
 /**
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index c8283c886236..34dc0fc59e48 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -61,9 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOLEOBJECT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOLEOBJECT_HXX
 
-#include "lwpobj.hxx"
-#include "lwpobjhdr.hxx"
-#include "lwpobjid.hxx"
+#include <lwpobj.hxx>
+#include <lwpobjhdr.hxx>
+#include <lwpobjid.hxx>
 #include "lwpstory.hxx"
 #include <tools/gen.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/lotuswordpro/source/filter/lwpoverride.cxx b/lotuswordpro/source/filter/lwpoverride.cxx
index f943bf728155..5c4a1002aebc 100644
--- a/lotuswordpro/source/filter/lwpoverride.cxx
+++ b/lotuswordpro/source/filter/lwpoverride.cxx
@@ -61,9 +61,9 @@
 #include <memory>
 
 #include "clone.hxx"
-#include "lwpoverride.hxx"
-#include "lwpfilehdr.hxx"
-#include "lwpatomholder.hxx"
+#include <lwpoverride.hxx>
+#include <lwpfilehdr.hxx>
+#include <lwpatomholder.hxx>
 #include "lwpborderstuff.hxx"
 #include "lwpmargins.hxx"
 #include "lwpbackgroundstuff.hxx"
diff --git a/lotuswordpro/source/filter/lwppagehint.hxx b/lotuswordpro/source/filter/lwppagehint.hxx
index 43490c29c4f7..9761b531d9b7 100644
--- a/lotuswordpro/source/filter/lwppagehint.hxx
+++ b/lotuswordpro/source/filter/lwppagehint.hxx
@@ -61,9 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPAGEHINT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPAGEHINT_HXX
 
-#include "lwpobj.hxx"
-#include "lwpobjid.hxx"
-#include "lwpatomholder.hxx"
+#include <lwpobj.hxx>
+#include <lwpobjid.hxx>
+#include <lwpatomholder.hxx>
 #include "lwpdlvlist.hxx"
 
 class LwpSLVListHead
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index 4074f1a9a752..b0630722f20a 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -63,16 +63,16 @@
 #include "lwppagehint.hxx"
 #include "lwpdivinfo.hxx"
 #include "lwpstory.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfmasterpage.hxx"
-#include "xfilter/xfcontentcontainer.hxx"
-#include "xfilter/xfheader.hxx"
-#include "xfilter/xfheaderstyle.hxx"
-#include "xfilter/xffooterstyle.hxx"
-#include "xfilter/xffooter.hxx"
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfmasterpage.hxx>
+#include <xfilter/xfcontentcontainer.hxx>
+#include <xfilter/xfheader.hxx>
+#include <xfilter/xfheaderstyle.hxx>
+#include <xfilter/xffooterstyle.hxx>
+#include <xfilter/xffooter.hxx>
 #include <sfx2/printer.hxx>
-#include "lwpchangemgr.hxx"
-#include "lwpglobalmgr.hxx"
+#include <lwpchangemgr.hxx>
+#include <lwpglobalmgr.hxx>
 
 LwpPageLayout::LwpPageLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpLayout(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwppagelayout.hxx b/lotuswordpro/source/filter/lwppagelayout.hxx
index 13e4740f78e4..9dda1e2d11c2 100644
--- a/lotuswordpro/source/filter/lwppagelayout.hxx
+++ b/lotuswordpro/source/filter/lwppagelayout.hxx
@@ -58,7 +58,7 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPAGELAYOUT_HXX
 
 #include "lwplayout.hxx"
-#include "xfilter/xfmasterpage.hxx"
+#include <xfilter/xfmasterpage.hxx>
 
 
 class LwpHeaderLayout;
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 17b1708ceee8..2a881f58d50e 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -59,25 +59,25 @@
  ************************************************************************/
 
 #include "lwppara.hxx"
-#include "lwpglobalmgr.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpglobalmgr.hxx>
+#include <lwpfilehdr.hxx>
 #include "lwpparaproperty.hxx"
-#include "lwptools.hxx"
+#include <lwptools.hxx>
 #include "lwpparastyle.hxx"
-#include "xfilter/xffont.hxx"
-#include "xfilter/xftextstyle.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfparagraph.hxx"
-#include "xfilter/xftextcontent.hxx"
-#include "xfilter/xftextspan.hxx"
-#include "xfilter/xfmargins.hxx"
-#include "xfilter/xftabstop.hxx"
-#include "xfilter/xflinebreak.hxx"
-#include "xfilter/xfsection.hxx"
-#include "xfilter/xfsectionstyle.hxx"
-#include "xfilter/xfcolor.hxx"
-#include "xfilter/xfhyperlink.hxx"
-#include "xfilter/xfliststyle.hxx"
+#include <xfilter/xffont.hxx>
+#include <xfilter/xftextstyle.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfparagraph.hxx>
+#include <xfilter/xftextcontent.hxx>
+#include <xfilter/xftextspan.hxx>
+#include <xfilter/xfmargins.hxx>
+#include <xfilter/xftabstop.hxx>
+#include <xfilter/xflinebreak.hxx>
+#include <xfilter/xfsection.hxx>
+#include <xfilter/xfsectionstyle.hxx>
+#include <xfilter/xfcolor.hxx>
+#include <xfilter/xfhyperlink.hxx>
+#include <xfilter/xfliststyle.hxx>
 #include "lwpcharsetmgr.hxx"
 #include "lwpsection.hxx"
 #include "lwplayout.hxx"
@@ -85,15 +85,15 @@
 #include "lwpbulletstylemgr.hxx"
 #include "lwpstory.hxx"
 #include "lwpsilverbullet.hxx"
-#include "xfilter/xflist.hxx"
-#include "xfilter/xfframe.hxx"
+#include <xfilter/xflist.hxx>
+#include <xfilter/xfframe.hxx>
 
 #include "lwpdivinfo.hxx"
 #include "lwpdoc.hxx"
 #include "lwpholder.hxx"
 #include "lwppagehint.hxx"
 
-#include "lwpdropcapmgr.hxx"
+#include <lwpdropcapmgr.hxx>
 #include "lwptable.hxx"
 #include <memory>
 
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index 8cbac2f5a324..c3619ffceb8c 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -64,23 +64,23 @@
 #include <memory>
 
 #include "lwpfribheader.hxx"
-#include "lwpobj.hxx"
-#include "lwpobjstrm.hxx"
+#include <lwpobj.hxx>
+#include <lwpobjstrm.hxx>
 
 #include <vector>
-#include "lwpheader.hxx"
+#include <lwpheader.hxx>
 #include "lwpdlvlist.hxx"
-#include "lwpbasetype.hxx"
-#include "lwpoverride.hxx"
-#include "lwpfoundry.hxx"
+#include <lwpbasetype.hxx>
+#include <lwpoverride.hxx>
+#include <lwpfoundry.hxx>
 #include "lwplayout.hxx"
-#include "lwpfrib.hxx"
+#include <lwpfrib.hxx>
 #include "lwpfribptr.hxx"
 #include "lwpfribtext.hxx"
-#include "xfilter/xfparagraph.hxx"
-#include "xfilter/xfdefs.hxx"
-#include "xfilter/xfparastyle.hxx"
-#include "xfilter/xfsection.hxx"
+#include <xfilter/xfparagraph.hxx>
+#include <xfilter/xfdefs.hxx>
+#include <xfilter/xfparastyle.hxx>
+#include <xfilter/xfsection.hxx>
 
 class LwpParaProperty;
 class LwpPara;
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index 4af676192b1f..7a6b97f2b214 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -63,24 +63,24 @@
 #include <boost/cast.hpp>
 
 #include "lwppara.hxx"
-#include "lwpglobalmgr.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpglobalmgr.hxx>
+#include <lwpfilehdr.hxx>
 #include "lwpparaproperty.hxx"
-#include "lwptools.hxx"
+#include <lwptools.hxx>
 #include "lwpparastyle.hxx"
-#include "xfilter/xffont.hxx"
-#include "xfilter/xftextstyle.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfparagraph.hxx"
-#include "xfilter/xftextcontent.hxx"
-#include "xfilter/xftextspan.hxx"
-#include "xfilter/xfmargins.hxx"
-#include "xfilter/xftabstop.hxx"
-#include "xfilter/xflinebreak.hxx"
-#include "xfilter/xfsection.hxx"
-#include "xfilter/xfsectionstyle.hxx"
-#include "xfilter/xfcolor.hxx"
-#include "xfilter/xfhyperlink.hxx"
+#include <xfilter/xffont.hxx>
+#include <xfilter/xftextstyle.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfparagraph.hxx>
+#include <xfilter/xftextcontent.hxx>
+#include <xfilter/xftextspan.hxx>
+#include <xfilter/xfmargins.hxx>
+#include <xfilter/xftabstop.hxx>
+#include <xfilter/xflinebreak.hxx>
+#include <xfilter/xfsection.hxx>
+#include <xfilter/xfsectionstyle.hxx>
+#include <xfilter/xfcolor.hxx>
+#include <xfilter/xfhyperlink.hxx>
 #include "lwpcharsetmgr.hxx"
 #include "lwpsection.hxx"
 #include "lwplayout.hxx"
@@ -89,15 +89,15 @@
 #include "lwpbulletstylemgr.hxx"
 #include "lwpstory.hxx"
 #include "lwpsilverbullet.hxx"
-#include "xfilter/xflist.hxx"
-#include "xfilter/xfframe.hxx"
+#include <xfilter/xflist.hxx>
+#include <xfilter/xfframe.hxx>
 
 #include "lwpdivinfo.hxx"
 #include "lwpdoc.hxx"
 #include "lwpholder.hxx"
 #include "lwppagehint.hxx"
 
-#include "lwpdropcapmgr.hxx"
+#include <lwpdropcapmgr.hxx>
 #include "lwptable.hxx"
 #include "lwpcelllayout.hxx"
 #include "lwpframelayout.hxx"
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.hxx b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
index 2fa6fa717ba6..8392ad7fd65c 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARABORDEROVERRIDE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARABORDEROVERRIDE_HXX
 
-#include "lwpoverride.hxx"
+#include <lwpoverride.hxx>
 
 class LwpBorderStuff;
 class LwpShadow;
diff --git a/lotuswordpro/source/filter/lwpparaproperty.cxx b/lotuswordpro/source/filter/lwpparaproperty.cxx
index 297a1f09d2be..4df55a5bbec8 100644
--- a/lotuswordpro/source/filter/lwpparaproperty.cxx
+++ b/lotuswordpro/source/filter/lwpparaproperty.cxx
@@ -59,7 +59,7 @@
  ************************************************************************/
 
 #include "lwpparaproperty.hxx"
-#include "lwpobjtags.hxx"
+#include <lwpobjtags.hxx>
 #include "lwppara.hxx"
 
 void LwpPara::ReadPropertyList(LwpObjectStream* pFile)
diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx
index 698550ddda65..89bd4cd52820 100644
--- a/lotuswordpro/source/filter/lwpparaproperty.hxx
+++ b/lotuswordpro/source/filter/lwpparaproperty.hxx
@@ -62,11 +62,11 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARAPROPERTY_HXX
 
 #include <memory>
-#include "lwpobj.hxx"
-#include "lwpobjstrm.hxx"
+#include <lwpobj.hxx>
+#include <lwpobjstrm.hxx>
 #include "lwpdllist.hxx"
 
-#include "lwpoverride.hxx"
+#include <lwpoverride.hxx>
 #include "lwppiece.hxx"
 
 /* paragraph property ID's */
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index c5054ee16458..b51d24b22251 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -61,18 +61,18 @@
 #include <memory>
 
 #include "lwpparastyle.hxx"
-#include "lwpfilehdr.hxx"
-#include "lwpoverride.hxx"
+#include <lwpfilehdr.hxx>
+#include <lwpoverride.hxx>
 #include "lwpparaborderoverride.hxx"
 #include "lwpbreaksoverride.hxx"
 #include "lwpnumberingoverride.hxx"
 #include "lwptaboverride.hxx"
 #include "lwpbackgroundoverride.hxx"
-#include "xfilter/xfdefs.hxx"
-#include "xfilter/xfparastyle.hxx"
-#include "xfilter/xfborders.hxx"
-#include "lwpfont.hxx"
-#include "lwpfoundry.hxx"
+#include <xfilter/xfdefs.hxx>
+#include <xfilter/xfparastyle.hxx>
+#include <xfilter/xfborders.hxx>
+#include <lwpfont.hxx>
+#include <lwpfoundry.hxx>
 #include "lwppiece.hxx"
 #include "lwpshadow.hxx"
 #include "lwpborderstuff.hxx"
diff --git a/lotuswordpro/source/filter/lwppiece.hxx b/lotuswordpro/source/filter/lwppiece.hxx
index b1a190fbb8d1..1ca1bcdd4848 100644
--- a/lotuswordpro/source/filter/lwppiece.hxx
+++ b/lotuswordpro/source/filter/lwppiece.hxx
@@ -61,9 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPIECE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPIECE_HXX
 
-#include "lwpobj.hxx"
-#include "lwpoverride.hxx"
-#include "lwpobjstrm.hxx"
+#include <lwpobj.hxx>
+#include <lwpoverride.hxx>
+#include <lwpobjstrm.hxx>
 #include "lwpdlvlist.hxx"
 #include "lwpbreaksoverride.hxx"
 #include "lwpparaborderoverride.hxx"
diff --git a/lotuswordpro/source/filter/lwpproplist.hxx b/lotuswordpro/source/filter/lwpproplist.hxx
index 94fe01d8afad..7398a995cc85 100644
--- a/lotuswordpro/source/filter/lwpproplist.hxx
+++ b/lotuswordpro/source/filter/lwpproplist.hxx
@@ -61,9 +61,9 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPROPLIST_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPROPLIST_HXX
 
-#include "lwpobj.hxx"
+#include <lwpobj.hxx>
 #include "lwpdlvlist.hxx"
-#include "lwpatomholder.hxx"
+#include <lwpatomholder.hxx>
 
 class LwpPropListElement : public LwpDLVList
 {
diff --git a/lotuswordpro/source/filter/lwpprtinfo.hxx b/lotuswordpro/source/filter/lwpprtinfo.hxx
index 4f44aa4c3849..30f2a2484c36 100644
--- a/lotuswordpro/source/filter/lwpprtinfo.hxx
+++ b/lotuswordpro/source/filter/lwpprtinfo.hxx
@@ -61,8 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPRTINFO_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPRTINFO_HXX
 
-#include "lwpatomholder.hxx"
-#include "lwpobjstrm.hxx"
+#include <lwpatomholder.hxx>
+#include <lwpobjstrm.hxx>
 /**
  * @brief   printer info used in VO_DOCUMENT
  *      not parsed yet
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx
index f51c0e17cb29..f80adffb20ec 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -60,14 +60,14 @@
 
 #include "lwprowlayout.hxx"
 #include "lwptable.hxx"
-#include "lwpglobalmgr.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfrow.hxx"
-#include "xfilter/xfrowstyle.hxx"
-#include "xfilter/xftablestyle.hxx"
-#include "xfilter/xftable.hxx"
-#include "xfilter/xfcell.hxx"
-#include "xfilter/xfcellstyle.hxx"
+#include <lwpglobalmgr.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfrow.hxx>
+#include <xfilter/xfrowstyle.hxx>
+#include <xfilter/xftablestyle.hxx>
+#include <xfilter/xftable.hxx>
+#include <xfilter/xfcell.hxx>
+#include <xfilter/xfcellstyle.hxx>
 
 LwpRowLayout::LwpRowLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpVirtualLayout(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
index ec207fa50de0..c1c13a15f603 100644
--- a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
+++ b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
@@ -62,8 +62,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWDRAWHEADER_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWDRAWHEADER_HXX
 
-#include "lwpheader.hxx"
-#include "lwptools.hxx"
+#include <lwpheader.hxx>
+#include <lwptools.hxx>
 
 const sal_uInt8 DRAW_FACESIZE = 32;
 const double THRESHOLD = 0.0001;
diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
index 5f4cd9660f68..804060e018bc 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
@@ -59,7 +59,7 @@
 #include "lwpsdwfileloader.hxx"
 #include "lwpsdwgrouploaderv0102.hxx"
 
-#include "xfilter/xfframe.hxx"
+#include <xfilter/xfframe.hxx>
 
 LwpSdwFileLoader::LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphicObj)
     : m_pStream(pStream)
diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.hxx b/lotuswordpro/source/filter/lwpsdwfileloader.hxx
index a8edc629ddbf..d8335475b499 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.hxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.hxx
@@ -63,8 +63,8 @@
 
 #include <rtl/ref.hxx>
 
-#include "lwpheader.hxx"
-#include "xfilter/ixfstream.hxx"
+#include <lwpheader.hxx>
+#include <xfilter/ixfstream.hxx>
 
 class SvStream;
 class XFFrame;
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
index 41f0af74477c..ef94322c23f7 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
@@ -58,22 +58,22 @@
 
 #include "lwpsdwgrouploaderv0102.hxx"
 #include "lwpdrawobj.hxx"
-#include "lwptools.hxx"
+#include <lwptools.hxx>
 #include "lwpcharsetmgr.hxx"
 #include "lwpgrfobj.hxx"
 #include "lwpframelayout.hxx"
 
-#include "xfilter/xfcolor.hxx"
-#include "xfilter/xfdrawline.hxx"
-#include "xfilter/xfdrawpath.hxx"
-#include "xfilter/xfdrawpolyline.hxx"
-#include "xfilter/xfdrawrect.hxx"
-#include "xfilter/xfdrawpolygon.hxx"
-#include "xfilter/xfdrawgroup.hxx"
-#include "xfilter/xfdrawstyle.hxx"
-#include "xfilter/xfdrawlinestyle.hxx"
-#include "xfilter/xfparagraph.hxx"
-#include "xfilter/xfstylemanager.hxx"
+#include <xfilter/xfcolor.hxx>
+#include <xfilter/xfdrawline.hxx>
+#include <xfilter/xfdrawpath.hxx>
+#include <xfilter/xfdrawpolyline.hxx>
+#include <xfilter/xfdrawrect.hxx>
+#include <xfilter/xfdrawpolygon.hxx>
+#include <xfilter/xfdrawgroup.hxx>
+#include <xfilter/xfdrawstyle.hxx>
+#include <xfilter/xfdrawlinestyle.hxx>
+#include <xfilter/xfparagraph.hxx>
+#include <xfilter/xfstylemanager.hxx>
 
 LwpSdwGroupLoaderV0102::LwpSdwGroupLoaderV0102(SvStream* pStream, LwpGraphicObject* pGraphicObj)
     : m_pStream(pStream)
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
index 718e0f29e511..deea9627bba7 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
@@ -61,7 +61,7 @@
 
 #include <rtl/ref.hxx>
 
-#include "lwpheader.hxx"
+#include <lwpheader.hxx>
 #include "lwpsdwdrawheader.hxx"
 
 class SvStream;
diff --git a/lotuswordpro/source/filter/lwpsdwrect.hxx b/lotuswordpro/source/filter/lwpsdwrect.hxx
index 39c228f028c9..25a8daf12159 100644
--- a/lotuswordpro/source/filter/lwpsdwrect.hxx
+++ b/lotuswordpro/source/filter/lwpsdwrect.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWRECT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWRECT_HXX
 
-#include "lwpheader.hxx"
+#include <lwpheader.hxx>
 #include <tools/gen.hxx>
 #include <array>
 
diff --git a/lotuswordpro/source/filter/lwpsection.cxx b/lotuswordpro/source/filter/lwpsection.cxx
index 49c5174ba784..27b61fcc9d82 100644
--- a/lotuswordpro/source/filter/lwpsection.cxx
+++ b/lotuswordpro/source/filter/lwpsection.cxx
@@ -58,13 +58,13 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwpcolor.hxx"
-#include "lwpatomholder.hxx"
+#include <lwpcolor.hxx>
+#include <lwpatomholder.hxx>
 #include "lwplayout.hxx"
 #include "lwpdlvlist.hxx"
-#include "lwpobj.hxx"
+#include <lwpobj.hxx>
 #include "lwpsection.hxx"
-#include "xfilter/xfsection.hxx"
+#include <xfilter/xfsection.hxx>
 
 LwpOrderedObject::LwpOrderedObject(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpDLNFVList(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwpshadow.hxx b/lotuswordpro/source/filter/lwpshadow.hxx
index 6a2e496df336..5d27ce7b544c 100644
--- a/lotuswordpro/source/filter/lwpshadow.hxx
+++ b/lotuswordpro/source/filter/lwpshadow.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSHADOW_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSHADOW_HXX
 
-#include "lwpcolor.hxx"
-#include "lwptools.hxx"
+#include <lwpcolor.hxx>
+#include <lwptools.hxx>
 
 class LwpShadow
 {
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index ff3cbafc9e9c..63f5090f4afc 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -59,15 +59,15 @@
  ************************************************************************/
 
 #include <memory>
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwpsilverbullet.hxx"
 #include "lwpdoc.hxx"
 #include "lwpdivinfo.hxx"
-#include "lwpfoundry.hxx"
+#include <lwpfoundry.hxx>
 #include "lwpstory.hxx"
 #include "lwppara.hxx"
-#include "xfilter/xfliststyle.hxx"
-#include "xfilter/xfstylemanager.hxx"
+#include <xfilter/xfliststyle.hxx>
+#include <xfilter/xfstylemanager.hxx>
 
 LwpSilverBullet::LwpSilverBullet(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpDLNFVList(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx
index 790a1a6ab675..111e5792872c 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.hxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx
@@ -62,12 +62,12 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSILVERBULLET_HXX
 
 #include <memory>
-#include "lwpheader.hxx"
-#include "lwpobj.hxx"
+#include <lwpheader.hxx>
+#include <lwpobj.hxx>
 #include "lwpdlvlist.hxx"
-#include "lwpobjid.hxx"
-#include "lwpatomholder.hxx"
-#include "unicode/utypes.h"
+#include <lwpobjid.hxx>
+#include <lwpatomholder.hxx>
+#include <unicode/utypes.h>
 const sal_uInt16 MAXNUMBERPOSITIONS = 10; //max number of positions
 const sal_uInt16 NUMCHAR_none = 0x00;   //none of numberchar
 const sal_uInt16 NUMCHAR_1 = 0x01;      //index for numberchar "1"
diff --git a/lotuswordpro/source/filter/lwpsortopt.hxx b/lotuswordpro/source/filter/lwpsortopt.hxx
index 4b96b8d7420a..81da561a8a34 100644
--- a/lotuswordpro/source/filter/lwpsortopt.hxx
+++ b/lotuswordpro/source/filter/lwpsortopt.hxx
@@ -61,8 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSORTOPT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSORTOPT_HXX
 
-#include "lwpheader.hxx"
-#include "lwpobjstrm.hxx"
+#include <lwpheader.hxx>
+#include <lwpobjstrm.hxx>
 
 /**
  * @brief       sort key class for LwpSortOption
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index ff08a7e1f910..19a1de7bf08e 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -60,11 +60,11 @@
         2. the content of layout object
  ************************************************************************/
 
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwpstory.hxx"
-#include "xfilter/xfstylemanager.hxx"
+#include <xfilter/xfstylemanager.hxx>
 #include "lwppara.hxx"
-#include "lwpobjfactory.hxx"
+#include <lwpobjfactory.hxx>
 #include "lwppagelayout.hxx"
 
 
diff --git a/lotuswordpro/source/filter/lwpsvstream.cxx b/lotuswordpro/source/filter/lwpsvstream.cxx
index 7ad492e27926..b6b065e3e8e5 100644
--- a/lotuswordpro/source/filter/lwpsvstream.cxx
+++ b/lotuswordpro/source/filter/lwpsvstream.cxx
@@ -53,7 +53,7 @@
  *
  *
  ************************************************************************/
-#include "lwpsvstream.hxx"
+#include <lwpsvstream.hxx>
 #include <tools/stream.hxx>
 
 const sal_uInt32 LwpSvStream::LWP_STREAM_BASE = 0x0010;
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index 19c65c31710b..b296c436efcb 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -61,13 +61,13 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABLE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABLE_HXX
 
-#include "lwpobj.hxx"
-#include "lwpobjhdr.hxx"
-#include "lwpobjid.hxx"
+#include <lwpobj.hxx>
+#include <lwpobjhdr.hxx>
+#include <lwpobjid.hxx>
 #include "lwpstory.hxx"
 #include "lwppara.hxx"
 #include "lwppagehint.hxx"
-#include "lwptools.hxx"
+#include <lwptools.hxx>
 #include "lwptablelayout.hxx"
 
 class LwpTableLayout;
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 7e57f1a50f1e..de78337ba4b8 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -58,10 +58,10 @@
  *  For LWP filter architecture prototype - table layouts
  */
 
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwptablelayout.hxx"
-#include "lwpfoundry.hxx"
-#include "lwpobjfactory.hxx"
+#include <lwpfoundry.hxx>
+#include <lwpobjfactory.hxx>
 #include "lwpholder.hxx"
 #include "lwptable.hxx"
 #include "lwptblcell.hxx"
@@ -69,19 +69,19 @@
 #include "lwpdlvlist.hxx"
 #include "lwppara.hxx"
 
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xftablestyle.hxx"
-#include "xfilter/xftable.hxx"
-#include "xfilter/xfrow.hxx"
-#include "xfilter/xfrowstyle.hxx"
-#include "xfilter/xfcell.hxx"
-#include "xfilter/xfcellstyle.hxx"
-#include "xfilter/xfcolstyle.hxx"
-#include "xfilter/xfframestyle.hxx"
-#include "xfilter/xfframe.hxx"
-#include "xfilter/xffloatframe.hxx"
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xftablestyle.hxx>
+#include <xfilter/xftable.hxx>
+#include <xfilter/xfrow.hxx>
+#include <xfilter/xfrowstyle.hxx>
+#include <xfilter/xfcell.hxx>
+#include <xfilter/xfcellstyle.hxx>
+#include <xfilter/xfcolstyle.hxx>
+#include <xfilter/xfframestyle.hxx>
+#include <xfilter/xfframe.hxx>
+#include <xfilter/xffloatframe.hxx>
 #include "lwpframelayout.hxx"
-#include "xfilter/xfparastyle.hxx"
+#include <xfilter/xfparastyle.hxx>
 #include <memory>
 
 LwpSuperTableLayout::LwpSuperTableLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
diff --git a/lotuswordpro/source/filter/lwptaboverride.hxx b/lotuswordpro/source/filter/lwptaboverride.hxx
index c9c2de54fb14..dd1eabe5a390 100644
--- a/lotuswordpro/source/filter/lwptaboverride.hxx
+++ b/lotuswordpro/source/filter/lwptaboverride.hxx
@@ -60,8 +60,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABOVERRIDE_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABOVERRIDE_HXX
 
-#include "lwpoverride.hxx"
-#include "lwpobjid.hxx"
+#include <lwpoverride.hxx>
+#include <lwpobjid.hxx>
 
 class   LwpTabOverride : public LwpOverride
 {
diff --git a/lotuswordpro/source/filter/lwptabrack.cxx b/lotuswordpro/source/filter/lwptabrack.cxx
index a3aac9a586fc..5f852707a91d 100644
--- a/lotuswordpro/source/filter/lwptabrack.cxx
+++ b/lotuswordpro/source/filter/lwptabrack.cxx
@@ -58,7 +58,7 @@
  * Tabrack for LwpTabPiece object.
  ************************************************************************/
 #include "lwptabrack.hxx"
-#include "lwpobjstrm.hxx"
+#include <lwpobjstrm.hxx>
 
 #include <stdexcept>
 
diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx
index 4cc936057c01..8feec5a55d12 100644
--- a/lotuswordpro/source/filter/lwptabrack.hxx
+++ b/lotuswordpro/source/filter/lwptabrack.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABRACK_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABRACK_HXX
 
-#include "lwpobj.hxx"
+#include <lwpobj.hxx>
 
 class   LwpObjectStream;
 class   LwpTab;
diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx
index 0021a186cf53..b293deecd3d0 100644
--- a/lotuswordpro/source/filter/lwptblcell.cxx
+++ b/lotuswordpro/source/filter/lwptblcell.cxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype - table cell numerics format
  */
 
-#include "lwpoverride.hxx"
-#include "lwpobjid.hxx"
+#include <lwpoverride.hxx>
+#include <lwpobjid.hxx>
 #include "lwptblcell.hxx"
 #include "lwppara.hxx"
 
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx
index 2ccaec0ccd28..89ef2071b69e 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -61,11 +61,11 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLCELL_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLCELL_HXX
 
-#include "lwpobj.hxx"
-#include "lwpatomholder.hxx"
+#include <lwpobj.hxx>
+#include <lwpatomholder.hxx>
 #include "lwpstory.hxx"
 
-#include "xfilter/xfcell.hxx"
+#include <xfilter/xfcell.hxx>
 
 // temporily added for compile
 class LwpObject;
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 71fb413da82d..665a3f3258ec 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -58,7 +58,7 @@
  *  For LWP filter architecture prototype - table cell numerics format
  */
 
-#include "lwpoverride.hxx"
+#include <lwpoverride.hxx>
 #include "lwptblcell.hxx"
 #include "lwppara.hxx"
 #include "lwptblformula.hxx"
diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index 52aaf6625b68..4e94e7aac4b2 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -59,21 +59,21 @@
  */
 
 #include "lwptoc.hxx"
-#include "lwpfoundry.hxx"
+#include <lwpfoundry.hxx>
 #include "lwpdoc.hxx"
 #include "lwpframelayout.hxx"
-#include "lwpglobalmgr.hxx"
-
-#include "xfilter/xffont.hxx"
-#include "xfilter/xftextstyle.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xfparagraph.hxx"
-#include "xfilter/xfparastyle.hxx"
-#include "xfilter/xfindex.hxx"
-#include "xfilter/xffloatframe.hxx"
-#include "xfilter/xfframestyle.hxx"
-#include "xfilter/xfframe.hxx"
-#include "xfilter/xftable.hxx"
+#include <lwpglobalmgr.hxx>
+
+#include <xfilter/xffont.hxx>
+#include <xfilter/xftextstyle.hxx>
+#include <xfilter/xfstylemanager.hxx>
+#include <xfilter/xfparagraph.hxx>
+#include <xfilter/xfparastyle.hxx>
+#include <xfilter/xfindex.hxx>
+#include <xfilter/xffloatframe.hxx>
+#include <xfilter/xfframestyle.hxx>
+#include <xfilter/xfframe.hxx>
+#include <xfilter/xftable.hxx>
 
 LwpTocSuperLayout::LwpTocSuperLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpSuperTableLayout(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx
index 1dc62a1d42d9..7390eb1e3878 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -58,7 +58,7 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#include "lwptools.hxx"
+#include <lwptools.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/process.h>
 #include <osl/thread.h>
diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx
index 36095fe72b28..933e32a13a9a 100644
--- a/lotuswordpro/source/filter/lwpuidoc.hxx
+++ b/lotuswordpro/source/filter/lwpuidoc.hxx
@@ -61,15 +61,15 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUIDOC_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUIDOC_HXX
 
-#include "lwpheader.hxx"
-#include "lwpdefs.hxx"
+#include <lwpheader.hxx>
+#include <lwpdefs.hxx>
 
 class LwpNamedProperties;
 class LwpAutoRunMacroOptions;
 class LwpMergeOptions;
 
-#include "lwpobjstrm.hxx"
-#include "lwpatomholder.hxx"
+#include <lwpobjstrm.hxx>
+#include <lwpatomholder.hxx>
 /**
  * @brief       Properties in UIDocument structure
  *          not parsed yet
diff --git a/lotuswordpro/source/filter/lwpusewhen.hxx b/lotuswordpro/source/filter/lwpusewhen.hxx
index ba6698a46808..9b89a3b1ac9f 100644
--- a/lotuswordpro/source/filter/lwpusewhen.hxx
+++ b/lotuswordpro/source/filter/lwpusewhen.hxx
@@ -61,7 +61,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSEWHEN_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSEWHEN_HXX
 
-#include "lwpheader.hxx"
+#include <lwpheader.hxx>
 
 #define STYLE_USEONALLPAGES     0x0001U /* repeat on all pages */
 #define STYLE_USEONALLEVENPAGES 0x0002U /* repeat on all even pages */
diff --git a/lotuswordpro/source/filter/lwpusrdicts.cxx b/lotuswordpro/source/filter/lwpusrdicts.cxx
index 01f50c88247d..f4362368469e 100644
--- a/lotuswordpro/source/filter/lwpusrdicts.cxx
+++ b/lotuswordpro/source/filter/lwpusrdicts.cxx
@@ -59,7 +59,7 @@
  ************************************************************************/
 
 #include "lwpusrdicts.hxx"
-#include "lwpatomholder.hxx"
+#include <lwpatomholder.hxx>
 
 LwpUserDictFiles::LwpUserDictFiles(LwpObjectStream *pStrm)
 {
diff --git a/lotuswordpro/source/filter/lwpusrdicts.hxx b/lotuswordpro/source/filter/lwpusrdicts.hxx
index 7127662f4656..1ed9555b7004 100644
--- a/lotuswordpro/source/filter/lwpusrdicts.hxx
+++ b/lotuswordpro/source/filter/lwpusrdicts.hxx
@@ -61,8 +61,8 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSRDICTS_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSRDICTS_HXX
 
-#include "lwpheader.hxx"
-#include "lwpobjstrm.hxx"
+#include <lwpheader.hxx>
+#include <lwpobjstrm.hxx>
 /**
  * @brief   User defined words used in VO_DOCUMENT
 */
diff --git a/lotuswordpro/source/filter/lwpverdocument.cxx b/lotuswordpro/source/filter/lwpverdocument.cxx
index c87d758d9d31..ccbcc8762198 100644
--- a/lotuswordpro/source/filter/lwpverdocument.cxx
+++ b/lotuswordpro/source/filter/lwpverdocument.cxx
@@ -60,12 +60,12 @@
  * CVersionedGointer, so use one class
  ************************************************************************/
 
-#include "lwpglobalmgr.hxx"
+#include <lwpglobalmgr.hxx>
 #include "lwpverdocument.hxx"
 #include "lwplnopts.hxx"
 #include "lwpproplist.hxx"
-#include "xfilter/xfparastyle.hxx"
-#include "lwptools.hxx"
+#include <xfilter/xfparastyle.hxx>
+#include <lwptools.hxx>
 
 LwpVerDocument::LwpVerDocument(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwpverdocument.hxx b/lotuswordpro/source/filter/lwpverdocument.hxx
index b5c2026f2747..e80e412b44d0 100644
--- a/lotuswordpro/source/filter/lwpverdocument.hxx
+++ b/lotuswordpro/source/filter/lwpverdocument.hxx
@@ -63,7 +63,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPVERDOCUMENT_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPVERDOCUMENT_HXX
 
-#include "lwpobj.hxx"
+#include <lwpobj.hxx>
 
 /*VO_VERDOCUMENT*/
 
diff --git a/lotuswordpro/source/filter/lwpvpointer.cxx b/lotuswordpro/source/filter/lwpvpointer.cxx
index 12f36daf318e..29599e69fc97 100644
--- a/lotuswordpro/source/filter/lwpvpointer.cxx
+++ b/lotuswordpro/source/filter/lwpvpointer.cxx
@@ -54,7 +54,7 @@
  *
  ************************************************************************/
 #include "lwpvpointer.hxx"
-#include "lwpfilehdr.hxx"
+#include <lwpfilehdr.hxx>
 
 LwpVersionedPointer::LwpVersionedPointer(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwpvpointer.hxx b/lotuswordpro/source/filter/lwpvpointer.hxx
index 3d26d38806d1..38be2b6a5f49 100644
--- a/lotuswordpro/source/filter/lwpvpointer.hxx
+++ b/lotuswordpro/source/filter/lwpvpointer.hxx
@@ -63,7 +63,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPVPOINTER_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPVPOINTER_HXX
 
-#include "lwpobj.hxx"
+#include <lwpobj.hxx>
 class LwpVersionedPointer : public LwpObject
 {
 public:
diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index be8a7b1d264c..c98ec8562642 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -59,7 +59,7 @@
 #include <cstring>
 
 #include "first.hxx"
-#include "assert.h"
+#include <assert.h>
 namespace OpenStormBento
 {
 
diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.hxx b/lotuswordpro/source/filter/xfilter/xfbase64.hxx
index 9ee6a81b9004..8101a203bbcc 100644
--- a/lotuswordpro/source/filter/xfilter/xfbase64.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbase64.hxx
@@ -60,7 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBASE64_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBASE64_HXX
 
-#include "xfilter/xfglobal.hxx"
+#include <xfilter/xfglobal.hxx>
 
 /**
  * @brief
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
index 0aea0fc2bb8f..d5c7079d77d6 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
@@ -57,7 +57,7 @@
  * @file
  * Background image.
  ************************************************************************/
-#include "xfilter/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 2a5c1aab6287..b8027db02247 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 "xfilter/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 52f06b571f49..077298c38d27 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -57,13 +57,13 @@
  * @file
  * Table cell.
  ************************************************************************/
-#include "xfilter/xfcell.hxx"
+#include <xfilter/xfcell.hxx>
 
 #include <stdexcept>
 
-#include "xfilter/xfparagraph.hxx"
-#include "xfilter/xftable.hxx"
-#include "xfilter/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 d665798578d6..7366bc71a22d 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 "xfilter/xfcellstyle.hxx"
-#include "xfilter/xfborders.hxx"
-#include "xfilter/xffont.hxx"
-#include "xfilter/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 825ae0880850..554e420b8ba6 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 "xfilter/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 2979f871cea1..dc96c73851b9 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 "xfilter/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 e13e3cb2bfc3..e13810a5023e 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx
@@ -57,7 +57,7 @@
  * @file
  * Column style object.
  ************************************************************************/
-#include "xfilter/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 2c0a10c67424..635fc9111add 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 "xfilter/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 a6bc652ba21f..00d2b3c12fa7 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 "xfilter/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 b3ddd305e4d2..6b36f597cbb8 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 "xfilter/xfcontentcontainer.hxx"
-#include "xfilter/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 15801c7a950b..dfd065a61bd8 100644
--- a/lotuswordpro/source/filter/xfilter/xfcrossref.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcrossref.cxx
@@ -60,9 +60,9 @@
 
 #include <sal/config.h>
 
-#include "xfilter/ixfattrlist.hxx"
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/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 649bbf43f8c5..dd6186809207 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 "xfilter/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 465dadf12225..54c039c95787 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 "xfilter/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 3b3e04c606da..7281f063c9e7 100644
--- a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
@@ -57,7 +57,7 @@
  * @file
  * doc field.
  ************************************************************************/
-#include "xfilter/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 bf31def5ab1c..bfc72f71c2cd 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 "xfilter/xfstyle.hxx"
-#include "xfilter/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 76ff3732f00a..b59ba6174ad0 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
@@ -57,7 +57,7 @@
  * @file
  * Line object.
  ************************************************************************/
-#include "xfilter/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 583fdee63fc3..a0e95fd7975c 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 "xfilter/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 1d982149ee86..b756617ba5a3 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 "xfilter/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 fe37469242e3..dc217b233f92 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -57,7 +57,7 @@
  * @file
  * Draw path object.
  ************************************************************************/
-#include "xfilter/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 ef29d81c2684..4298eb5111fa 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
@@ -57,7 +57,7 @@
  * @file
  * Polygon object.
  */
-#include "xfilter/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 31c17e81162f..847f9be1c62d 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
@@ -57,7 +57,7 @@
  * @file
  * Polyline.
  ************************************************************************/
-#include "xfilter/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 edf45b01fcce..63bf4b6b347e 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx
@@ -57,7 +57,7 @@
  * @file
  * Rect object.
  ************************************************************************/
-#include "xfilter/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 f633063cfc62..445919b8f1e3 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 "xfilter/xfdrawstyle.hxx"
-#include "xfilter/xfdrawlinestyle.hxx"
+#include <xfilter/xfdrawstyle.hxx>
+#include <xfilter/xfdrawlinestyle.hxx>
 #include "xfdrawareastyle.hxx"
-#include "xfilter/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 c6d3497aaf5b..fb71ff40f7e6 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfentry.cxx
@@ -60,9 +60,9 @@
 
 #include <sal/config.h>
 
-#include "xfilter/ixfattrlist.hxx"
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/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 9c7384ad8752..80bf6171de28 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 "xfilter/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 a5c2a7e42b57..c25df39b20d7 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 "xfilter/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 9b074e43d9c3..087ca078baeb 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 "xfilter/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 53e6565aac84..c4f06d64a74b 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 "xfilter/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 58ac1b57e55d..39b5c891347a 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 "xfilter/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 5bcb20761780..7ae09473cb52 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 "xfilter/xfframe.hxx"
-#include "xfilter/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 ce0c8297f57d..178372956660 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 "xfilter/xfframestyle.hxx"
-#include "xfilter/xfcolumns.hxx"
-#include "xfilter/xfborders.hxx"
-#include "xfilter/xfshadow.hxx"
-#include "xfilter/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 8e676bb5ba4f..160dfba4907a 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 "xfilter/xfglobal.hxx"
-#include "xfilter/xffontfactory.hxx"
-#include "xfilter/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 c1bbba40668c..29ad6cf4566e 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 "xfilter/xfheaderstyle.hxx"
-#include "xfilter/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 09f0ec10b47a..b03bb1b0a276 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx
@@ -57,7 +57,7 @@
  * @file
  * Image object.
  ************************************************************************/
-#include "xfilter/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 f9f1d55c5ede..5885d7e95e59 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
@@ -57,9 +57,9 @@
  * @file
  * Image style object.
  ************************************************************************/
-#include "xfilter/xfimagestyle.hxx"
-#include "xfilter/xfborders.hxx"
-#include "xfilter/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 14ec1417535a..de8d041e9bca 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 "xfilter/xfindex.hxx"
-#include "xfilter/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 33d620a25da4..b9e71c302c14 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.cxx
@@ -57,10 +57,10 @@
  * @file
  * List object.
  ************************************************************************/
-#include "xfilter/xflist.hxx"
-#include "xfilter/xflistitem.hxx"
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/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 844f65bd1a5b..16b71b4fb3f4 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 "xfilter/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 63fb3e298623..f447450db5a9 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 "xfilter/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 f015a3516c96..d92a0218a059 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 "xfilter/xfmasterpage.hxx"
-#include "xfilter/xfpagemaster.hxx"
-#include "xfilter/xfstylemanager.hxx"
-#include "xfilter/xffooter.hxx"
-#include "xfilter/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 77dbd1144fae..baf6c5a53d1e 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 "xfilter/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 95aaadf448e3..9867449bc34c 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 "xfilter/xfofficemeta.hxx"
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/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 8a645771c556..c572138e4c04 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 "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"
+#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 b5e8a17d2876..6f68bf2f185b 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 "xfilter/xfparagraph.hxx"
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/ixfattrlist.hxx"
-#include "xfilter/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 106cd707b4e9..6fe3b29c5004 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 "xfilter/xfparastyle.hxx"
-#include "xfilter/xffont.hxx"
-#include "xfilter/xfborders.hxx"
+#include <xfilter/xfparastyle.hxx>
+#include <xfilter/xffont.hxx>
+#include <xfilter/xfborders.hxx>
 #include "xftabstyle.hxx"
-#include "xfilter/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 c87c3c96cec5..157c198cd42b 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.cxx
@@ -60,11 +60,11 @@
 
 #include <sal/config.h>
 
-#include "xfilter/ixfattrlist.hxx"
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/xfrow.hxx"
-#include "xfilter/xfcell.hxx"
-#include "xfilter/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 8a5a00e55f42..0ff3893b9a65 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 "xfilter/xfrowstyle.hxx"
-#include "xfilter/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 a56c85ee436c..f3c59bfbe1be 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 "xfilter/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 8963495eaf70..4f667ae3a13c 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 "xfilter/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 d87858efa53e..7f94f726184d 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx
@@ -57,7 +57,7 @@
  * @file
  * Section object.
  ************************************************************************/
-#include "xfilter/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 ded41d53298b..2ffb4850beca 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 "xfilter/xfsectionstyle.hxx"
-#include "xfilter/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 00d601c82f82..8eb969b0b5a5 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 "xfilter/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 e606b9a22459..d6846340efcb 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.cxx
@@ -57,7 +57,7 @@
  * @file
  * Base style object .
  ************************************************************************/
-#include "xfilter/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 7ed604deb0a1..5d94e127ac40 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 "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"
+#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 31d54639b62a..634869d0ae8e 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
@@ -61,9 +61,9 @@
 #include <sal/config.h>
 
 #include <xfilter/xfparastyle.hxx>
-#include "xfilter/xfstylemanager.hxx"
+#include <xfilter/xfstylemanager.hxx>
 #include <xfilter/xftextstyle.hxx>
-#include "xfilter/ixfstyle.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 a693171386b0..209a06d8b654 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -57,10 +57,10 @@
  * @file
  * Table object.
  ************************************************************************/
-#include "xfilter/xftable.hxx"
-#include "xfilter/xfrow.hxx"
-#include "xfilter/xfcolstyle.hxx"
-#include "xfilter/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 fff8de5c4e6a..0679e41de26f 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
@@ -57,8 +57,8 @@
  * @file
  * Table style.
  ************************************************************************/
-#include "xfilter/xftablestyle.hxx"
-#include "xfilter/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 c960bc79a993..138e84ddca79 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 "xfilter/xfglobal.hxx"
-#include "xfilter/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 014aa6a001c2..39336dd4fd07 100644
--- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
@@ -53,11 +53,11 @@
  *
  *
  ************************************************************************/
-#include "xfilter/xftextboxstyle.hxx"
-#include "xfilter/xfcolumns.hxx"
-#include "xfilter/xfborders.hxx"
-#include "xfilter/xfshadow.hxx"
-#include "xfilter/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 e18e03fe824d..9a9befd877dc 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
@@ -54,8 +54,8 @@
  *
  ************************************************************************/
 
-#include "xfilter/xftextcontent.hxx"
-#include "xfilter/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 d43d601650f4..0820987ff838 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 "xfilter/xftextspan.hxx"
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/ixfattrlist.hxx"
-#include "xfilter/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 1f91dca93bdf..85b79a980b19 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 "xfilter/xftextstyle.hxx"
-#include "xfilter/ixfattrlist.hxx"
-#include "xfilter/ixfstream.hxx"
-#include "xfilter/xffont.hxx"
-#include "xfilter/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 4b1758f9a0aa..f88080bdf028 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 "xfilter/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 50b4bd1a6053..c54662283644 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 "xfilter/xfutil.hxx"
-#include "xfilter/xfparagraph.hxx"
-#include "xfilter/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-23 22:37:31 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:46:02 +0200
commit	e6ecc6e428a49c725484547dfa4454bab3aba882 (patch)
tree	3e857cd74783ede2ee80b726298d9a64f5d91494 /lotuswordpro
parent	60de56cf1ae694fd86a2ce20711cf97958228656 (diff)