fixincludeguards.sh: lotuswordpro

Change-Id: Ic3e01b5ecfb159d88c7c849a85ff612cdda5b418
author: Thomas Arnhold <thomas@arnhold.org> 2014-04-18 22:11:40 +0200
committer: Thomas Arnhold <thomas@arnhold.org> 2014-04-19 11:10:11 +0200
commit: edf23912c5dbdadd532f0965dade97b71962e9bc (patch)
tree: 045104ddbfc3c6dcdf31667780738e05275fcbcf /lotuswordpro
parent: 4cd139c313737066d02ac3c735feaa2f7001d365 (diff)
211 files changed, 425 insertions, 425 deletions
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index 3da1db34879b..bcf811f4e324 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _LOTUSWORDPROIMPORTFILTER_HXX
-#define _LOTUSWORDPROIMPORTFILTER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LOTUSWORDPROIMPORTFILTER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LOTUSWORDPROIMPORTFILTER_HXX
 
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 25c7db6ad4c8..842f773ceea9 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef BENTO_H
-#define BENTO_H
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_BENTO_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_BENTO_HXX
 
 #include <string>
 #include <vector>
diff --git a/lotuswordpro/source/filter/bentoid.hxx b/lotuswordpro/source/filter/bentoid.hxx
index d34cc45a1510..663bfdc1ef8a 100644
--- a/lotuswordpro/source/filter/bentoid.hxx
+++ b/lotuswordpro/source/filter/bentoid.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef BENTOID_H
-#define BENTOID_H
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_BENTOID_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_BENTOID_HXX
 
 namespace OpenStormBento
 {
diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx
index a44d2c74bce1..9db360bcc847 100644
--- a/lotuswordpro/source/filter/explode.hxx
+++ b/lotuswordpro/source/filter/explode.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef _EXPLODE_HXX_
-#define _EXPLODE_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_EXPLODE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_EXPLODE_HXX
 
 #include <tools/stream.hxx>
 
diff --git a/lotuswordpro/source/filter/first.hxx b/lotuswordpro/source/filter/first.hxx
index 2f58fc176213..08d35cd65ac3 100644
--- a/lotuswordpro/source/filter/first.hxx
+++ b/lotuswordpro/source/filter/first.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef FIRST_HXX
-#define FIRST_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_FIRST_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_FIRST_HXX
 
 #include "bento.hxx"
 
diff --git a/lotuswordpro/source/filter/localtime.hxx b/lotuswordpro/source/filter/localtime.hxx
index e3920296d929..a861325e7c12 100644
--- a/lotuswordpro/source/filter/localtime.hxx
+++ b/lotuswordpro/source/filter/localtime.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef _LWPTIME_HXX_
-#define _LWPTIME_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LOCALTIME_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LOCALTIME_HXX
 
 struct LtTm
 {
diff --git a/lotuswordpro/source/filter/lwp9reader.hxx b/lotuswordpro/source/filter/lwp9reader.hxx
index 5c490681f8c0..f22cd8b4d9b8 100644
--- a/lotuswordpro/source/filter/lwp9reader.hxx
+++ b/lotuswordpro/source/filter/lwp9reader.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef _LWP9READER_HXX
-#define _LWP9READER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWP9READER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWP9READER_HXX
 
 #include "lwpheader.hxx"
 #include "lwpunoheader.hxx"
diff --git a/lotuswordpro/source/filter/lwparrowstyles.hxx b/lotuswordpro/source/filter/lwparrowstyles.hxx
index 32440d055c34..21ba5f8cf5df 100644
--- a/lotuswordpro/source/filter/lwparrowstyles.hxx
+++ b/lotuswordpro/source/filter/lwparrowstyles.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef     _LWPARROWSTYLES_HXX
-#define     _LWPARROWSTYLES_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPARROWSTYLES_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPARROWSTYLES_HXX
 
 #include "xfilter/xfarrowstyle.hxx"
 #include "xfilter/xfstylemanager.hxx"
diff --git a/lotuswordpro/source/filter/lwpatomholder.hxx b/lotuswordpro/source/filter/lwpatomholder.hxx
index c5cb10b0662c..89a9e871591d 100644
--- a/lotuswordpro/source/filter/lwpatomholder.hxx
+++ b/lotuswordpro/source/filter/lwpatomholder.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef _LWPATOMHOLDER_HXX
-#define _LWPATOMHOLDER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPATOMHOLDER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPATOMHOLDER_HXX
 
 #include "lwpheader.hxx"
 #include "lwpdefs.hxx"
diff --git a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
index 27efa386d20f..afd3e89c606e 100644
--- a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef     _LWPBACKGROUNDOVERRIDE_HXX
-#define     _LWPBACKGROUNDOVERRIDE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDOVERRIDE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDOVERRIDE_HXX
 
 #include "lwpoverride.hxx"
 #include "lwpbackgroundstuff.hxx"
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
index f45ecc2eaf67..8e5588a8f0a3 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
@@ -57,8 +57,8 @@
 * @file
 * Backgound object of Wordpro.
 ************************************************************************/
-#ifndef     _LWPBACKGROUNDSTUFF_HXX
-#define     _LWPBACKGROUNDSTUFF_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDSTUFF_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDSTUFF_HXX
 #include "lwpcolor.hxx"
 
 /* background patterns */
diff --git a/lotuswordpro/source/filter/lwpbasetype.hxx b/lotuswordpro/source/filter/lwpbasetype.hxx
index 7ca08e1ad62d..7a2359d4ec84 100644
--- a/lotuswordpro/source/filter/lwpbasetype.hxx
+++ b/lotuswordpro/source/filter/lwpbasetype.hxx
@@ -63,8 +63,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPBASETYPE_HXX
-#define _LWPBASETYPE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBASETYPE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBASETYPE_HXX
 
 #include "lwpobjstrm.hxx"
 #include "lwpheader.hxx"
diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.hxx b/lotuswordpro/source/filter/lwpbookmarkmgr.hxx
index 4b7e9a04125b..4db85d56a014 100644
--- a/lotuswordpro/source/filter/lwpbookmarkmgr.hxx
+++ b/lotuswordpro/source/filter/lwpbookmarkmgr.hxx
@@ -61,8 +61,8 @@
  * Change History
  May 2005           Created
  ************************************************************************/
-#ifndef _LWPBOOKMARKMGR_HXX_
-#define _LWPBOOKMARKMGR_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBOOKMARKMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBOOKMARKMGR_HXX
 
 #include "lwpfilehdr.hxx"
 #include <map>
diff --git a/lotuswordpro/source/filter/lwpborderstuff.hxx b/lotuswordpro/source/filter/lwpborderstuff.hxx
index c3c656894114..a8de3e149068 100644
--- a/lotuswordpro/source/filter/lwpborderstuff.hxx
+++ b/lotuswordpro/source/filter/lwpborderstuff.hxx
@@ -57,8 +57,8 @@
 * @file
 * Border stuff of Wordpro.
 ************************************************************************/
-#ifndef     _LWPBORDERSTUFF_HXX
-#define     _LWPBORDERSTUFF_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBORDERSTUFF_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBORDERSTUFF_HXX
 
 #include "lwpcolor.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.hxx b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
index f2f2b27309fc..d44a5ae050e7 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
@@ -57,8 +57,8 @@
 * @file
 * Breaks override of Wordpro.
 ************************************************************************/
-#ifndef     _LWPBREAKSOVERRIDE_HXX
-#define     _LWPBREAKSOVERRIDE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBREAKSOVERRIDE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBREAKSOVERRIDE_HXX
 
 #include "lwpoverride.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index 09fe87e9c569..773738a8fd05 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jan 2005           Created
  ************************************************************************/
-#ifndef _LWPBULLETSTYLEMGR_HXX
-#define _LWPBULLETSTYLEMGR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBULLETSTYLEMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBULLETSTYLEMGR_HXX
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx
index 3046e966589a..d9ab7589609f 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.hxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.hxx
@@ -61,8 +61,8 @@
  * Change History
  Mar 2005           Created
  ************************************************************************/
-#ifndef _LWPCELLLAYOUT_HXX
-#define _LWPCELLLAYOUT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCELLLAYOUT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCELLLAYOUT_HXX
 #include <vector>
 #include <map>
 #include "lwplayout.hxx"
diff --git a/lotuswordpro/source/filter/lwpchangemgr.hxx b/lotuswordpro/source/filter/lwpchangemgr.hxx
index 3262b1bf98ad..9c9cdb70cefd 100644
--- a/lotuswordpro/source/filter/lwpchangemgr.hxx
+++ b/lotuswordpro/source/filter/lwpchangemgr.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jun 2005           Created
  ************************************************************************/
-#ifndef _LWPCHANGEMGR_HXX_
-#define _LWPCHANGEMGR_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHANGEMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHANGEMGR_HXX
 
 #include <map>
 #include <vector>
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.hxx b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
index 2698008c81ee..1df2d90ccc3f 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.hxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jan 2005           Created
  ************************************************************************/
-#ifndef _LWPCHARACTERSTYLE_HXX
-#define _LWPCHARACTERSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARACTERSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARACTERSTYLE_HXX
 
 #include "lwpobj.hxx"
 #include "lwpdlvlist.hxx"
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.hxx b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
index 4c4a42534764..cdce105ad97b 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPCHARBORDEROVERRIDE_HXX
-#define _LWPCHARBORDEROVERRIDE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARBORDEROVERRIDE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARBORDEROVERRIDE_HXX
 
 #include "lwpoverride.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpcharsetmgr.hxx b/lotuswordpro/source/filter/lwpcharsetmgr.hxx
index 6995026ac1fc..6125e5ac9fcd 100644
--- a/lotuswordpro/source/filter/lwpcharsetmgr.hxx
+++ b/lotuswordpro/source/filter/lwpcharsetmgr.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jan 2005           Created
  ************************************************************************/
-#ifndef _LWPCHARSETMGR_HXX
-#define _LWPCHARSETMGR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARSETMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCHARSETMGR_HXX
 
 #include "lwpfilehdr.hxx"
 #include <map>
diff --git a/lotuswordpro/source/filter/lwpcolor.hxx b/lotuswordpro/source/filter/lwpcolor.hxx
index 61ed9c3e2d8b..9f58c1a62375 100644
--- a/lotuswordpro/source/filter/lwpcolor.hxx
+++ b/lotuswordpro/source/filter/lwpcolor.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPCOLOR_HXX
-#define _LWPCOLOR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCOLOR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCOLOR_HXX
 
 #include "lwpobjstrm.hxx"
 #include "lwpheader.hxx"
diff --git a/lotuswordpro/source/filter/lwpcontent.hxx b/lotuswordpro/source/filter/lwpcontent.hxx
index 78f3489eda45..aaca21980649 100644
--- a/lotuswordpro/source/filter/lwpcontent.hxx
+++ b/lotuswordpro/source/filter/lwpcontent.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPCONTENT_HXX
-#define _LWPCONTENT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCONTENT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPCONTENT_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobj.hxx"
diff --git a/lotuswordpro/source/filter/lwpdefs.hxx b/lotuswordpro/source/filter/lwpdefs.hxx
index 29d6a5712df6..7f2c1632d3a3 100644
--- a/lotuswordpro/source/filter/lwpdefs.hxx
+++ b/lotuswordpro/source/filter/lwpdefs.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPDEFS_HXX
-#define _LWPDEFS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDEFS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDEFS_HXX
 
 #define BAD_OFFSET 0xFFFFFFFFUL
 #define BAD_ATOM ((sal_Int32)(-1))              // Invalid Atom ID
diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx
index 2b30caa50718..01ab6456cc21 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.hxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPDIVINFO_HXX
-#define _LWPDIVINFO_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVINFO_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVINFO_HXX
 
 #include "lwpobj.hxx"
 #include "lwpobjid.hxx"
diff --git a/lotuswordpro/source/filter/lwpdivopts.hxx b/lotuswordpro/source/filter/lwpdivopts.hxx
index c381126a3b48..8d0d645428aa 100644
--- a/lotuswordpro/source/filter/lwpdivopts.hxx
+++ b/lotuswordpro/source/filter/lwpdivopts.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPDIVISIONOPTIONS_HXX
-#define _LWPDIVISIONOPTIONS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVOPTS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDIVOPTS_HXX
 
 #include "lwpobj.hxx"
 #include "lwpobjid.hxx"
diff --git a/lotuswordpro/source/filter/lwpdllist.hxx b/lotuswordpro/source/filter/lwpdllist.hxx
index f250bd88213a..bbb67d200561 100644
--- a/lotuswordpro/source/filter/lwpdllist.hxx
+++ b/lotuswordpro/source/filter/lwpdllist.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPDLLIST_HXX_
-#define _LWPDLLIST_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDLLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDLLIST_HXX
 #include "lwpheader.hxx"
 class LwpDLList
 {
diff --git a/lotuswordpro/source/filter/lwpdlvlist.hxx b/lotuswordpro/source/filter/lwpdlvlist.hxx
index 74ed42406110..a00ba30154ec 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.hxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef LWPDLVLIST_HXX_
-#define LWPDLVLIST_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDLVLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDLVLIST_HXX
 
 #include "lwpatomholder.hxx"
 #include "lwpobj.hxx"
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx
index 1f6f7140c44d..fb10521aec50 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -63,8 +63,8 @@
  Jun 2005           Code cleaning by change some members to local variables in Read()
  ************************************************************************/
 
-#ifndef _LWPDOCUMENT_HXX
-#define _LWPDOCUMENT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDOC_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDOC_HXX
 
 #include "lwpobj.hxx"
 #include "lwpsortopt.hxx"
diff --git a/lotuswordpro/source/filter/lwpdocdata.hxx b/lotuswordpro/source/filter/lwpdocdata.hxx
index 99eaf556f83b..adf3a3155859 100644
--- a/lotuswordpro/source/filter/lwpdocdata.hxx
+++ b/lotuswordpro/source/filter/lwpdocdata.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef LWPDOCDATA_HXX_
-#define LWPDOCDATA_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDOCDATA_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDOCDATA_HXX
 #include "lwpobj.hxx"
 #include "lwpatomholder.hxx"
 #include "localtime.hxx"
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index d28614e2344d..33dad651c6e0 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -59,8 +59,8 @@
  *  and so on.
  */
 
-#ifndef _LWPDRAWOBJ_HXX
-#define _LWPDRAWOBJ_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDRAWOBJ_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDRAWOBJ_HXX
 
 #include "lwpsdwdrawheader.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpdropcapmgr.hxx b/lotuswordpro/source/filter/lwpdropcapmgr.hxx
index 540d81bc81c9..a8a53d43b039 100644
--- a/lotuswordpro/source/filter/lwpdropcapmgr.hxx
+++ b/lotuswordpro/source/filter/lwpdropcapmgr.hxx
@@ -62,8 +62,8 @@
  Mar 2005           created
  ************************************************************************/
 
-#ifndef _LWPDROPCAPMGR_HXX
-#define _LWPDROPCAPMGR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDROPCAPMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPDROPCAPMGR_HXX
 
 #include "xfilter/xfparagraph.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpfilehdr.hxx b/lotuswordpro/source/filter/lwpfilehdr.hxx
index f70bc8e7acf5..896e3330857b 100644
--- a/lotuswordpro/source/filter/lwpfilehdr.hxx
+++ b/lotuswordpro/source/filter/lwpfilehdr.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef _LWPFILEHEADER_HXX
-#define _LWPFILEHEADER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFILEHDR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFILEHDR_HXX
 
 #include "lwpobjid.hxx"
 /**
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx
index b41fdc671657..6f82a1d57455 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -57,8 +57,8 @@
  * @file
  * Circle object.
  ************************************************************************/
-#ifndef _LWPFILTER_HXX
-#define _LWPFILTER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFILTER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFILTER_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase4.hxx>
diff --git a/lotuswordpro/source/filter/lwpfnlayout.hxx b/lotuswordpro/source/filter/lwpfnlayout.hxx
index 43d07da72056..970cba568987 100644
--- a/lotuswordpro/source/filter/lwpfnlayout.hxx
+++ b/lotuswordpro/source/filter/lwpfnlayout.hxx
@@ -61,8 +61,8 @@
  * Change History
  Mar 2005           Created
  ************************************************************************/
-#ifndef _LWP_FNLAYOUT_HXX
-#define _LWP_FNLAYOUT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFNLAYOUT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFNLAYOUT_HXX
 
 #include "lwptablelayout.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx
index 82d866bb0b0c..7ea545126860 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -65,8 +65,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPFONT_HXX
-#define _LWPFONT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFONT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFONT_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx
index f9c9aea4e6fd..a71d520e3fd9 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -61,8 +61,8 @@
  * Change History
  Mar 2005           Created
  ************************************************************************/
-#ifndef _LWPFRIBFOOTNOTE_HXX_
-#define _LWPFRIBFOOTNOTE_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFOOTNOTE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFOOTNOTE_HXX
 
 #include "lwpfrib.hxx"
 #include "lwpobj.hxx"
diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx
index 4e4aeb3dae0d..ae0834b020f8 100644
--- a/lotuswordpro/source/filter/lwpfoundry.hxx
+++ b/lotuswordpro/source/filter/lwpfoundry.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPFOUNDRY_HXX
-#define _LWPFOUNDRY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFOUNDRY_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFOUNDRY_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobjid.hxx"
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx
index 718a9b6e2bbe..c4535180714f 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -62,8 +62,8 @@
 Mar 2005            Created
  ************************************************************************/
 
-#ifndef _LWPFRAMELAYOUT_HXX
-#define _LWPFRAMELAYOUT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRAMELAYOUT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRAMELAYOUT_HXX
 
 #include "lwplayout.hxx"
 #include "lwpstory.hxx"
diff --git a/lotuswordpro/source/filter/lwpfrib.hxx b/lotuswordpro/source/filter/lwpfrib.hxx
index 30297f57ada9..d6d29760a772 100644
--- a/lotuswordpro/source/filter/lwpfrib.hxx
+++ b/lotuswordpro/source/filter/lwpfrib.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jan 2005           Created
  ************************************************************************/
-#ifndef _LWPFRIB_HXX_
-#define _LWPFRIB_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIB_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIB_HXX
 #include "lwpobjid.hxx"
 #include "lwpobjstrm.hxx"
 #include "lwpbasetype.hxx"
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.hxx b/lotuswordpro/source/filter/lwpfribbreaks.hxx
index bc6eace89e42..8181ffd1fe34 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.hxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jan 2005           Created
  ************************************************************************/
-#ifndef _LWPFRIBBREAKS_HXX_
-#define _LWPFRIBBREAKS_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBBREAKS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBBREAKS_HXX
 
 #include "lwpfrib.hxx"
 #include "xfilter/xfparastyle.hxx"
diff --git a/lotuswordpro/source/filter/lwpfribframe.hxx b/lotuswordpro/source/filter/lwpfribframe.hxx
index eadf142019c4..f3776880384f 100644
--- a/lotuswordpro/source/filter/lwpfribframe.hxx
+++ b/lotuswordpro/source/filter/lwpfribframe.hxx
@@ -61,8 +61,8 @@
  * Change History
  Mar 2005       Created
  ************************************************************************/
-#ifndef _LWPFRIBFRAME_HXX_
-#define _LWPFRIBFRAME_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBFRAME_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBFRAME_HXX
 #include "lwpfrib.hxx"
 #include "lwplayout.hxx"
 #include "lwppara.hxx"
diff --git a/lotuswordpro/source/filter/lwpfribheader.hxx b/lotuswordpro/source/filter/lwpfribheader.hxx
index 4bed45e2c482..5a2d8694a9cf 100644
--- a/lotuswordpro/source/filter/lwpfribheader.hxx
+++ b/lotuswordpro/source/filter/lwpfribheader.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef _LWPFRIBHEADER_HXX
-#define _LWPFRIBHEADER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBHEADER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBHEADER_HXX
 
 #define FRIB_TAG_NOUNICODE 0x40 // Don't xlate text to/from Unicode
 #define FRIB_TAG_MODIFIER 0x80  // This frib has a modifier on it
diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx
index ccef73cfc19d..93b8ca1ab61b 100644
--- a/lotuswordpro/source/filter/lwpfribmark.hxx
+++ b/lotuswordpro/source/filter/lwpfribmark.hxx
@@ -62,8 +62,8 @@
  May 2005           Created
  ************************************************************************/
 
-#ifndef _LWPFRIBMARKER_HXX_
-#define _LWPFRIBMARKER_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBMARK_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBMARK_HXX
 
 #include "lwpfrib.hxx"
 #include "lwpstory.hxx"
diff --git a/lotuswordpro/source/filter/lwpfribptr.hxx b/lotuswordpro/source/filter/lwpfribptr.hxx
index fc73a5b0b82d..678ccb2da024 100644
--- a/lotuswordpro/source/filter/lwpfribptr.hxx
+++ b/lotuswordpro/source/filter/lwpfribptr.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPFRIBPTR_HXX_
-#define _LWPFRIBPTR_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBPTR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBPTR_HXX
 
 #include "lwpobjstrm.hxx"
 #include "lwpfrib.hxx"
diff --git a/lotuswordpro/source/filter/lwpfribsection.hxx b/lotuswordpro/source/filter/lwpfribsection.hxx
index d4eb4a7349a9..b0f87dcb7e8e 100644
--- a/lotuswordpro/source/filter/lwpfribsection.hxx
+++ b/lotuswordpro/source/filter/lwpfribsection.hxx
@@ -61,8 +61,8 @@
  * Change History
 Jan 2005        Created
  ************************************************************************/
-#ifndef _LWPFRIBSECTION_HXX_
-#define _LWPFRIBSECTION_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBSECTION_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBSECTION_HXX
 #include "lwpfrib.hxx"
 #include "lwppara.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpfribtable.hxx b/lotuswordpro/source/filter/lwpfribtable.hxx
index 97d38ac5ac80..f7d0acbef49e 100644
--- a/lotuswordpro/source/filter/lwpfribtable.hxx
+++ b/lotuswordpro/source/filter/lwpfribtable.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef _LWPFRIBTABLE_HXX_
-#define _LWPFRIBTABLE_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBTABLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBTABLE_HXX
 
 #include "lwpfrib.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpfribtext.hxx b/lotuswordpro/source/filter/lwpfribtext.hxx
index ab7f1a8bc153..1fe16aa4749f 100644
--- a/lotuswordpro/source/filter/lwpfribtext.hxx
+++ b/lotuswordpro/source/filter/lwpfribtext.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jan 2005           Created
  ************************************************************************/
-#ifndef _LWPFRIBTEXT_HXX_
-#define _LWPFRIBTEXT_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBTEXT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFRIBTEXT_HXX
 
 #include "lwpfrib.hxx"
 #include "lwpstory.hxx"
diff --git a/lotuswordpro/source/filter/lwpglobalmgr.hxx b/lotuswordpro/source/filter/lwpglobalmgr.hxx
index 228d53428b78..066d77ef4644 100644
--- a/lotuswordpro/source/filter/lwpglobalmgr.hxx
+++ b/lotuswordpro/source/filter/lwpglobalmgr.hxx
@@ -61,8 +61,8 @@
  * Change History
  Nov 2005           Created
  ************************************************************************/
-#ifndef _LWPGLOBALMGR_HXX_
-#define _LWPGLOBALMGR_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPGLOBALMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPGLOBALMGR_HXX
 
 #include <map>
 #include "lwpheader.hxx"
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx
index f36653c2f1da..22e074d9ea0f 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef LWPGRFOBJECT_HXX_
-#define LWPGRFOBJECT_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPGRFOBJ_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPGRFOBJ_HXX
 
 #include <sal/types.h>
 
diff --git a/lotuswordpro/source/filter/lwpheader.hxx b/lotuswordpro/source/filter/lwpheader.hxx
index 711f9a99dccd..b09ce259254d 100644
--- a/lotuswordpro/source/filter/lwpheader.hxx
+++ b/lotuswordpro/source/filter/lwpheader.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  */
 
-#ifndef _LWPHEADERS_HXX
-#define _LWPHEADERS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHEADER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHEADER_HXX
 
 #include <config_lgpl.h>
 #include <math.h>
diff --git a/lotuswordpro/source/filter/lwpholder.hxx b/lotuswordpro/source/filter/lwpholder.hxx
index 46f10b166ffe..8e0f94bd8599 100644
--- a/lotuswordpro/source/filter/lwpholder.hxx
+++ b/lotuswordpro/source/filter/lwpholder.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPDLVLISTHEADHOLDER_HXX_
-#define _LWPDLVLISTHEADHOLDER_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHOLDER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHOLDER_HXX
 
 #include "lwpobj.hxx"
 #include "lwpdlvlist.hxx"
diff --git a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
index cc54ebb8c112..15d8529dba18 100644
--- a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
+++ b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx
@@ -61,8 +61,8 @@
  * Change History
  Mar 2005           Created
  ************************************************************************/
-#ifndef _LWPHYPERLINKMGR_HXX_
-#define _LWPHYPERLINKMGR_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHYPERLINKMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPHYPERLINKMGR_HXX
 
 #include "lwpfilehdr.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpidxmgr.hxx b/lotuswordpro/source/filter/lwpidxmgr.hxx
index fd48ebda4f49..43a520d16eab 100644
--- a/lotuswordpro/source/filter/lwpidxmgr.hxx
+++ b/lotuswordpro/source/filter/lwpidxmgr.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPINDEXMANAGER_HXX
-#define _LWPINDEXMANAGER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPIDXMGR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPIDXMGR_HXX
 
 #include <rtl/ustring.hxx>
 #include "lwpobjhdr.hxx"
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 18b9fb44db2c..497c19d9a431 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPLAYOUT_HXX
-#define _LWPLAYOUT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLAYOUT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLAYOUT_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobj.hxx"
diff --git a/lotuswordpro/source/filter/lwplayoutdef.hxx b/lotuswordpro/source/filter/lwplayoutdef.hxx
index fde3a14504db..2dcd569d3018 100644
--- a/lotuswordpro/source/filter/lwplayoutdef.hxx
+++ b/lotuswordpro/source/filter/lwplayoutdef.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef _LWPLAYOUTDEF_HXX
-#define _LWPLAYOUTDEF_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLAYOUTDEF_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLAYOUTDEF_HXX
 
 #define STYLE_AUTOLINK      0x01UL  /* content span's to next container */
 #define STYLE_SELECTABLE    0x02UL  /* selectable container */
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index fe764e36da1c..8f53dd80c157 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jan 28 2005            Created
  ************************************************************************/
-#ifndef _LWPLAYOUTPIECE_HXX
-#define _LWPLAYOUTPIECE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLAYPIECE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLAYPIECE_HXX
 
 #include "lwppiece.hxx"
 #include "lwpbasetype.hxx"
diff --git a/lotuswordpro/source/filter/lwplnopts.hxx b/lotuswordpro/source/filter/lwplnopts.hxx
index 8033fc227cbb..a13646dd4f6c 100644
--- a/lotuswordpro/source/filter/lwplnopts.hxx
+++ b/lotuswordpro/source/filter/lwplnopts.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPLINENUMBEROPTIONS_HXX
-#define _LWPLINENUMBEROPTIONS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLNOPTS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPLNOPTS_HXX
 
 #include "lwpobjstrm.hxx"
 #include "lwptools.hxx"
diff --git a/lotuswordpro/source/filter/lwpmargins.hxx b/lotuswordpro/source/filter/lwpmargins.hxx
index 613ca96cde79..d0e74dd51da4 100644
--- a/lotuswordpro/source/filter/lwpmargins.hxx
+++ b/lotuswordpro/source/filter/lwpmargins.hxx
@@ -54,8 +54,8 @@
  *
  ************************************************************************/
 
-#ifndef     _LWPMARGINS_HXX
-#define     _LWPMARGINS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPMARGINS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPMARGINS_HXX
 
 #include "lwpobjstrm.hxx"
 #include "lwptools.hxx"
diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx
index 64bb2e475cd5..4679a3a6085f 100644
--- a/lotuswordpro/source/filter/lwpmarker.hxx
+++ b/lotuswordpro/source/filter/lwpmarker.hxx
@@ -62,8 +62,8 @@
  Mar 2005           Created
  ************************************************************************/
 
-#ifndef _LWPMARKER_HXX_
-#define _LWPMARKER_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPMARKER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPMARKER_HXX
 
 #include "lwpobj.hxx"
 #include "lwpobjid.hxx"
diff --git a/lotuswordpro/source/filter/lwpnotes.hxx b/lotuswordpro/source/filter/lwpnotes.hxx
index da9760b3480f..9ab2abea2a3d 100644
--- a/lotuswordpro/source/filter/lwpnotes.hxx
+++ b/lotuswordpro/source/filter/lwpnotes.hxx
@@ -61,8 +61,8 @@
  * Change History
  May 2005       Created
  ************************************************************************/
-#ifndef _LWPNOTES_HXX_
-#define _LWPNOTES_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNOTES_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNOTES_HXX
 
 #include "lwpfrib.hxx"
 #include "lwpframelayout.hxx"
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
index dd1863dfb8b5..2326415ae407 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
@@ -57,8 +57,8 @@
 * @file
 * Numbering override of Wordpro.
 ************************************************************************/
-#ifndef     _LWPNUMBERINGOVERRIDE_HXX
-#define     _LWPNUMBERINGOVERRIDE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNUMBERINGOVERRIDE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNUMBERINGOVERRIDE_HXX
 
 #include "lwpoverride.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index e0f3fa885cb2..894680df8a90 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype - table object
  */
 
-#ifndef _LWPNUMBERICFMT_HXX
-#define _LWPNUMBERICFMT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNUMERICFMT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPNUMERICFMT_HXX
 
 #include "lwpatomholder.hxx"
 #include "lwptblcell.hxx"
diff --git a/lotuswordpro/source/filter/lwpobj.hxx b/lotuswordpro/source/filter/lwpobj.hxx
index 6020db402935..559a909e7365 100644
--- a/lotuswordpro/source/filter/lwpobj.hxx
+++ b/lotuswordpro/source/filter/lwpobj.hxx
@@ -62,8 +62,8 @@
  *  Base class of all Lwp VO objects
  */
 
-#ifndef _LWPOBJ_HXX_
-#define _LWPOBJ_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJ_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJ_HXX
 
 #include "lwpheader.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpobjfactory.hxx b/lotuswordpro/source/filter/lwpobjfactory.hxx
index 83da5d24c8cd..ddfe1c38842b 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.hxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef LWPOBJFACTORY_HXX_
-#define LWPOBJFACTORY_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJFACTORY_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJFACTORY_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobjid.hxx"
diff --git a/lotuswordpro/source/filter/lwpobjhdr.hxx b/lotuswordpro/source/filter/lwpobjhdr.hxx
index 35228ac49c98..659a05c0ab74 100644
--- a/lotuswordpro/source/filter/lwpobjhdr.hxx
+++ b/lotuswordpro/source/filter/lwpobjhdr.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPOBJECTHEADER_HXX
-#define _LWPOBJECTHEADER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJHDR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJHDR_HXX
 
 #include "lwpobjid.hxx"
 #include "lwpobjtags.hxx"
diff --git a/lotuswordpro/source/filter/lwpobjid.hxx b/lotuswordpro/source/filter/lwpobjid.hxx
index 41680114c34f..7059ac9db096 100644
--- a/lotuswordpro/source/filter/lwpobjid.hxx
+++ b/lotuswordpro/source/filter/lwpobjid.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPOBJECTID_HXX
-#define _LWPOBJECTID_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJID_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJID_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx b/lotuswordpro/source/filter/lwpobjstrm.hxx
index 60f2ce3365dc..4fbfeff62a64 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.hxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.hxx
@@ -63,8 +63,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPOBJECTSTREAM_HXX
-#define _LWPOBJECTSTREAM_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJSTRM_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJSTRM_HXX
 
 #include "lwpheader.hxx"
 #include "lwpsvstream.hxx"
diff --git a/lotuswordpro/source/filter/lwpobjtags.hxx b/lotuswordpro/source/filter/lwpobjtags.hxx
index b091ae45e579..687f53394df0 100644
--- a/lotuswordpro/source/filter/lwpobjtags.hxx
+++ b/lotuswordpro/source/filter/lwpobjtags.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef _LWPOBJTAGS_HXX_
-#define _LWPOBJTAGS_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJTAGS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOBJTAGS_HXX
 
 // file header object
 #define TAG_AMI             0x3750574CUL        // "LWP7"
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index 6386429b3008..a8cb30a16bb7 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -61,8 +61,8 @@
  * Change History
  Feb 2005           Created
  ************************************************************************/
-#ifndef _LWPOLEOBJECT_HXX_
-#define _LWPOLEOBJECT_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOLEOBJECT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOLEOBJECT_HXX
 
 #include "lwpobj.hxx"
 #include "lwpobjhdr.hxx"
diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/source/filter/lwpoverride.hxx
index 0f6b3c373efb..3a4181cff80c 100644
--- a/lotuswordpro/source/filter/lwpoverride.hxx
+++ b/lotuswordpro/source/filter/lwpoverride.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPOVERRIDE_HXX
-#define _LWPOVERRIDE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOVERRIDE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPOVERRIDE_HXX
 
 #include "lwpobjid.hxx"
 #include "lwptools.hxx"
diff --git a/lotuswordpro/source/filter/lwppagehint.hxx b/lotuswordpro/source/filter/lwppagehint.hxx
index 8da11704639f..73e90c94974a 100644
--- a/lotuswordpro/source/filter/lwppagehint.hxx
+++ b/lotuswordpro/source/filter/lwppagehint.hxx
@@ -61,8 +61,8 @@
  * Change History
  Feb 2005           Created
  ************************************************************************/
-#ifndef _LWPPAGEHINT_HXX
-#define _LWPPAGEHINT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPAGEHINT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPAGEHINT_HXX
 
 #include "lwpobj.hxx"
 #include "lwpobjid.hxx"
diff --git a/lotuswordpro/source/filter/lwppagelayout.hxx b/lotuswordpro/source/filter/lwppagelayout.hxx
index c9711efb7baa..f26d580e8bf4 100644
--- a/lotuswordpro/source/filter/lwppagelayout.hxx
+++ b/lotuswordpro/source/filter/lwppagelayout.hxx
@@ -58,8 +58,8 @@
 Mar 2005            Created
  ************************************************************************/
 
-#ifndef _LWPPAGELAYOUT_HXX
-#define _LWPPAGELAYOUT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPAGELAYOUT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPAGELAYOUT_HXX
 
 #include "lwplayout.hxx"
 
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index 1c9a76773091..4095bd111684 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPPARAGRAPH_HXX_
-#define _LWPPARAGRAPH_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARA_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARA_HXX
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.hxx b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
index 5be5f1e62a52..ceb4ee2ba53c 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
@@ -57,8 +57,8 @@
 * @file
 * Border override of Wordpro.
 ************************************************************************/
-#ifndef     _LWPPARABORDEROVERRIDE_HXX
-#define     _LWPPARABORDEROVERRIDE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARABORDEROVERRIDE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARABORDEROVERRIDE_HXX
 
 #include "lwpoverride.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx
index f9cf39a10f84..8f39f5529a8c 100644
--- a/lotuswordpro/source/filter/lwpparaproperty.hxx
+++ b/lotuswordpro/source/filter/lwpparaproperty.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jan 2005           Created
  ************************************************************************/
-#ifndef _LWPPARAPROPERTY_HXX_
-#define _LWPPARAPROPERTY_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARAPROPERTY_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARAPROPERTY_HXX
 
 #include "lwpobj.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx
index 86e8f02c897b..78f2a5bc4435 100644
--- a/lotuswordpro/source/filter/lwpparastyle.hxx
+++ b/lotuswordpro/source/filter/lwpparastyle.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPPARASTYLE_HXX
-#define _LWPPARASTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARASTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPARASTYLE_HXX
 
 #include "lwpcharacterstyle.hxx"
 #include "lwppiece.hxx"
diff --git a/lotuswordpro/source/filter/lwppiece.hxx b/lotuswordpro/source/filter/lwppiece.hxx
index de60072cec65..8da0b528b99a 100644
--- a/lotuswordpro/source/filter/lwppiece.hxx
+++ b/lotuswordpro/source/filter/lwppiece.hxx
@@ -62,8 +62,8 @@
  Jan 2005       Created
  ************************************************************************/
 
-#ifndef     _LWPPIECE_HXX
-#define     _LWPPIECE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPIECE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPIECE_HXX
 
 #include "lwpobj.hxx"
 #include "lwpoverride.hxx"
diff --git a/lotuswordpro/source/filter/lwpproplist.hxx b/lotuswordpro/source/filter/lwpproplist.hxx
index 1fd71bc09d82..1519bcd6240b 100644
--- a/lotuswordpro/source/filter/lwpproplist.hxx
+++ b/lotuswordpro/source/filter/lwpproplist.hxx
@@ -62,8 +62,8 @@
  Mar 2005           Created
  ************************************************************************/
 
-#ifndef _LWPPROPLIST_HXX_
-#define _LWPPROPLIST_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPROPLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPROPLIST_HXX
 
 #include "lwpobj.hxx"
 #include "lwpdlvlist.hxx"
diff --git a/lotuswordpro/source/filter/lwpprtinfo.hxx b/lotuswordpro/source/filter/lwpprtinfo.hxx
index 281c5b15c381..95e67a688201 100644
--- a/lotuswordpro/source/filter/lwpprtinfo.hxx
+++ b/lotuswordpro/source/filter/lwpprtinfo.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPPRINTERINFO_HXX
-#define _LWPPRINTERINFO_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPRTINFO_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPRTINFO_HXX
 
 #include "lwpatomholder.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/source/filter/lwppttntbl.hxx b/lotuswordpro/source/filter/lwppttntbl.hxx
index d2a1b6b9c3a0..b196e8c2af0f 100644
--- a/lotuswordpro/source/filter/lwppttntbl.hxx
+++ b/lotuswordpro/source/filter/lwppttntbl.hxx
@@ -59,8 +59,8 @@
  *  WordPro Pattern Table
  */
 
-#ifndef _LTPATTERNTABLE_HXX
-#define _LTPATTERNTABLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPTTNTBL_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPTTNTBL_HXX
 
 static const sal_uInt8 s_pLwpPatternTab[][8] = {                //Id  Name
     { 0xDF, 0xAF, 0x77, 0x77, 0x77, 0x77, 0xFA, 0xFD },//0  Transparent
diff --git a/lotuswordpro/source/filter/lwpresource.hxx b/lotuswordpro/source/filter/lwpresource.hxx
index 63355e3e5cc5..37dfe70e5199 100644
--- a/lotuswordpro/source/filter/lwpresource.hxx
+++ b/lotuswordpro/source/filter/lwpresource.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef     _RESOURCE_HXX
-#define     _RESOURCE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPRESOURCE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPRESOURCE_HXX
 
 #define     IMPLEMENTATION_NAME         "com.ibm.ILWPImportFilter"
 
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index 0b33d98e8abc..07de2c6404c4 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/lotuswordpro/source/filter/lwprowlayout.hxx
@@ -61,8 +61,8 @@
  * Change History
  April 2005         Created
  ************************************************************************/
-#ifndef _LWPROWLAYOUT_HXX
-#define _LWPROWLAYOUT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPROWLAYOUT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPROWLAYOUT_HXX
 
 #include "lwplayout.hxx"
 #include "lwptablelayout.hxx"
diff --git a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
index af6ae5f6c55a..d864e395410e 100644
--- a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
+++ b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
@@ -59,8 +59,8 @@
  * The file declares structures and enums used by Lwp-Drawing-Module
  */
 
-#ifndef _LWPSDWRAWHEADER_HXX
-#define _LWPSDWRAWHEADER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWDRAWHEADER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWDRAWHEADER_HXX
 
 #include "lwpheader.hxx"
 #include "lwptools.hxx"
diff --git a/lotuswordpro/source/filter/lwpsdwrect.hxx b/lotuswordpro/source/filter/lwpsdwrect.hxx
index 0b2b401184b5..e622c4315b2e 100644
--- a/lotuswordpro/source/filter/lwpsdwrect.hxx
+++ b/lotuswordpro/source/filter/lwpsdwrect.hxx
@@ -62,8 +62,8 @@
  * For LWP filter architecture prototype
  * Implementation file of SdwRectangle.
  */
-#ifndef _SDWRECTANGLE_HXX
-#define _SDWRECTANGLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWRECT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWRECT_HXX
 
 #include "lwpheader.hxx"
 #include <tools/gen.hxx>
diff --git a/lotuswordpro/source/filter/lwpsection.hxx b/lotuswordpro/source/filter/lwpsection.hxx
index ac06cae21e7a..4c15d80de346 100644
--- a/lotuswordpro/source/filter/lwpsection.hxx
+++ b/lotuswordpro/source/filter/lwpsection.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPSECTION_HXX
-#define _LWPSECTION_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSECTION_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSECTION_HXX
 #include "lwppagelayout.hxx"
 
 /**
diff --git a/lotuswordpro/source/filter/lwpshadow.hxx b/lotuswordpro/source/filter/lwpshadow.hxx
index e064bbc4997b..baf15fda01c6 100644
--- a/lotuswordpro/source/filter/lwpshadow.hxx
+++ b/lotuswordpro/source/filter/lwpshadow.hxx
@@ -57,8 +57,8 @@
  * @file
  *  For LWP filter architecture prototype
  ************************************************************************/
-#ifndef     _LWPSHADOW_HXX
-#define     _LWPSHADOW_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSHADOW_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSHADOW_HXX
 
 #include "lwpcolor.hxx"
 #include "lwptools.hxx"
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx
index e257f9f2c1a7..89ccf776b49a 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.hxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPSILVERBULLET_HXX
-#define _LWPSILVERBULLET_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSILVERBULLET_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSILVERBULLET_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobj.hxx"
diff --git a/lotuswordpro/source/filter/lwpslvlist.hxx b/lotuswordpro/source/filter/lwpslvlist.hxx
index f4f6c22e330f..2033e2024117 100644
--- a/lotuswordpro/source/filter/lwpslvlist.hxx
+++ b/lotuswordpro/source/filter/lwpslvlist.hxx
@@ -57,8 +57,8 @@
  * @file
  * single list.
  ************************************************************************/
-#ifndef     _LWPSLVLIST_HXX
-#define     _LWPSLVLIST_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSLVLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSLVLIST_HXX
 
 #include "lwpobjstrm.hxx"
 #include "lwpfilehdr.hxx"
diff --git a/lotuswordpro/source/filter/lwpsortopt.hxx b/lotuswordpro/source/filter/lwpsortopt.hxx
index 6bb75cb87a24..81ee1d6aef3a 100644
--- a/lotuswordpro/source/filter/lwpsortopt.hxx
+++ b/lotuswordpro/source/filter/lwpsortopt.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPSORTOPTION_HXX
-#define _LWPSORTOPTION_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSORTOPT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSORTOPT_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index f17d60207a55..dd86d728d094 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -64,8 +64,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPSTORY_HXX
-#define _LWPSTORY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSTORY_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSTORY_HXX
 #include "lwpcontent.hxx"
 
 class LwpPageLayout;
diff --git a/lotuswordpro/source/filter/lwpstyledef.hxx b/lotuswordpro/source/filter/lwpstyledef.hxx
index 907e11cb5c36..bbc042415c95 100644
--- a/lotuswordpro/source/filter/lwpstyledef.hxx
+++ b/lotuswordpro/source/filter/lwpstyledef.hxx
@@ -54,8 +54,8 @@
  *
  ************************************************************************/
 
-#ifndef _LWPSTYLEDEF_H_
-#define _LWPSTYLEDEF_H_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSTYLEDEF_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSTYLEDEF_HXX
 
 #define INVALID_ATTR_ID 0
 #define EXTERNAL_ID         0x8000
diff --git a/lotuswordpro/source/filter/lwpsvstream.hxx b/lotuswordpro/source/filter/lwpsvstream.hxx
index ff10b13d8ec5..e52127529c85 100644
--- a/lotuswordpro/source/filter/lwpsvstream.hxx
+++ b/lotuswordpro/source/filter/lwpsvstream.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef _SVSTREAM_HXX
-#define _SVSTREAM_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSVSTREAM_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSVSTREAM_HXX
 
 #include "lwpheader.hxx"
 #include "lwpunoheader.hxx"
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index 96b3974a795a..79b4485d6314 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -61,8 +61,8 @@
  * Change History
  Mar 2005           Created
  ************************************************************************/
-#ifndef _LWPTABLE_HXX_
-#define _LWPTABLE_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABLE_HXX
 
 #include "lwpobj.hxx"
 #include "lwpobjhdr.hxx"
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index d1bfcff03c73..ef72b752ca26 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -61,8 +61,8 @@
  * Change History
  Mar 2005           Created
  ************************************************************************/
-#ifndef _LWPTABLELAYOUT_HXX
-#define _LWPTABLELAYOUT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABLELAYOUT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABLELAYOUT_HXX
 #include <vector>
 #include <map>
 #include "lwplayout.hxx"
diff --git a/lotuswordpro/source/filter/lwptaboverride.hxx b/lotuswordpro/source/filter/lwptaboverride.hxx
index 2e8c5ed71500..7a6e7afbfa89 100644
--- a/lotuswordpro/source/filter/lwptaboverride.hxx
+++ b/lotuswordpro/source/filter/lwptaboverride.hxx
@@ -57,8 +57,8 @@
  * @file
  * Tab override for VO_PARASTYLE.
  ************************************************************************/
-#ifndef     _LWPTABOVERRIDE_HXX
-#define     _LWPTABOVERRIDE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABOVERRIDE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABOVERRIDE_HXX
 
 #include "lwpoverride.hxx"
 #include "lwpobjid.hxx"
diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx
index 9fe3170d07c0..8f0d3fda9ac2 100644
--- a/lotuswordpro/source/filter/lwptabrack.hxx
+++ b/lotuswordpro/source/filter/lwptabrack.hxx
@@ -57,8 +57,8 @@
  * @file
  * Tabrack for LwpTabPiece object.
  ************************************************************************/
-#ifndef     _LWPTABRACK_HXX
-#define     _LWPTABRACK_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABRACK_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTABRACK_HXX
 
 #include "lwpobj.hxx"
 
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx
index bf1a06920f8a..561020b20f0b 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -61,8 +61,8 @@
  * Change History
  Mar 2005           Created
  ************************************************************************/
-#ifndef _LWPLAYOUTNUMERICSOVERRIDE_HXX_
-#define _LWPLAYOUTNUMERICSOVERRIDE_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLCELL_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLCELL_HXX
 
 #include "lwpobj.hxx"
 #include "lwpatomholder.hxx"
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index 0a5060e3f7a5..cc467a6cc045 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -61,8 +61,8 @@
  * Change History
  Mar 2005           Created
  ************************************************************************/
-#ifndef _LWPTBLFORMULA_HXX_
-#define _LWPTBLFORMULA_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLFORMULA_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTBLFORMULA_HXX
 
 using namespace std;
 
diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx
index a06c20e5c309..4d3a792a3d15 100644
--- a/lotuswordpro/source/filter/lwptoc.hxx
+++ b/lotuswordpro/source/filter/lwptoc.hxx
@@ -59,8 +59,8 @@ April 2005          Created
  April 2005                 Modified - add LwpTocLevelData class
  ************************************************************************/
 
-#ifndef _LWPTOCSUPERTABLELAYOUT_HXX
-#define _LWPTOCSUPERTABLELAYOUT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTOC_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTOC_HXX
 #include "lwptablelayout.hxx"
 class XFIndex;
 class LwpFoundry;
diff --git a/lotuswordpro/source/filter/lwptools.hxx b/lotuswordpro/source/filter/lwptools.hxx
index 2ed2f41f8d11..cad9a81a6bd8 100644
--- a/lotuswordpro/source/filter/lwptools.hxx
+++ b/lotuswordpro/source/filter/lwptools.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPTOOLS_HXX
-#define _LWPTOOLS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTOOLS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPTOOLS_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx
index ed9c84bbd2c3..92c96a82cbda 100644
--- a/lotuswordpro/source/filter/lwpuidoc.hxx
+++ b/lotuswordpro/source/filter/lwpuidoc.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jan 2005           Created
  ************************************************************************/
-#ifndef _LWPUIDOCUMENT_HXX
-#define _LWPUIDOCUMENT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUIDOC_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUIDOC_HXX
 
 #include "lwpheader.hxx"
 #include "lwpdefs.hxx"
diff --git a/lotuswordpro/source/filter/lwpusewhen.hxx b/lotuswordpro/source/filter/lwpusewhen.hxx
index 4d14ef226ebc..61b8c00c6048 100644
--- a/lotuswordpro/source/filter/lwpusewhen.hxx
+++ b/lotuswordpro/source/filter/lwpusewhen.hxx
@@ -58,8 +58,8 @@
  *  For LWP filter architecture prototype
  ************************************************************************/
 
-#ifndef _LWPUSEWHEN_HXX
-#define _LWPUSEWHEN_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSEWHEN_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSEWHEN_HXX
 
 #include "lwpheader.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpusrdicts.hxx b/lotuswordpro/source/filter/lwpusrdicts.hxx
index 82b6471585cc..640bb56f0a3d 100644
--- a/lotuswordpro/source/filter/lwpusrdicts.hxx
+++ b/lotuswordpro/source/filter/lwpusrdicts.hxx
@@ -62,8 +62,8 @@
  Jan 2005           Created
  ************************************************************************/
 
-#ifndef _LWPUSERDICTFILES_HXX
-#define _LWPUSERDICTFILES_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSRDICTS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPUSRDICTS_HXX
 
 #include "lwpheader.hxx"
 #include "lwpobjstrm.hxx"
diff --git a/lotuswordpro/source/filter/lwpverdocument.hxx b/lotuswordpro/source/filter/lwpverdocument.hxx
index 0a47b1134235..0963d5ab392f 100644
--- a/lotuswordpro/source/filter/lwpverdocument.hxx
+++ b/lotuswordpro/source/filter/lwpverdocument.hxx
@@ -64,8 +64,8 @@
 Jun 2005        Created
  ************************************************************************/
 
-#ifndef _LWPVERDOCUMENT_HXX_
-#define _LWPVERDOCUMENT_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPVERDOCUMENT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPVERDOCUMENT_HXX
 
 #include "lwpobj.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpvpointer.hxx b/lotuswordpro/source/filter/lwpvpointer.hxx
index de7d02689cb2..dd25e0d28d65 100644
--- a/lotuswordpro/source/filter/lwpvpointer.hxx
+++ b/lotuswordpro/source/filter/lwpvpointer.hxx
@@ -64,8 +64,8 @@
 March 2005          Created
  ************************************************************************/
 
-#ifndef _LWPVERSIONEDPOINTER_HXX_
-#define _LWPVERSIONEDPOINTER_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPVPOINTER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPVPOINTER_HXX
 
 #include "lwpobj.hxx"
 class LwpVersionedPointer : public LwpObject
diff --git a/lotuswordpro/source/filter/tocread.hxx b/lotuswordpro/source/filter/tocread.hxx
index 4e2205416d1b..7568bc963a1d 100644
--- a/lotuswordpro/source/filter/tocread.hxx
+++ b/lotuswordpro/source/filter/tocread.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef TOCREAD_H
-#define TOCREAD_H
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_TOCREAD_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_TOCREAD_HXX
 namespace OpenStormBento
 {
 
diff --git a/lotuswordpro/source/filter/ut.hxx b/lotuswordpro/source/filter/ut.hxx
index d5c945f1ada5..3f3080160c93 100644
--- a/lotuswordpro/source/filter/ut.hxx
+++ b/lotuswordpro/source/filter/ut.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef UT_HXX
-#define UT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_UT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_UT_HXX
 # include <sal/types.h>
 
 namespace OpenStormBento
diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx
index 26e3a89f86cb..bd7f50faefcb 100644
--- a/lotuswordpro/source/filter/utlist.hxx
+++ b/lotuswordpro/source/filter/utlist.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef UTLIST_H
-#define UTLIST_H
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_UTLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_UTLIST_HXX
 
 #include "ut.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx b/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx
index 30265d9a0dee..8d44908ab675 100644
--- a/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx
@@ -57,8 +57,8 @@
  * @file
  * Interface for the attibute list of a xml element.
  ************************************************************************/
-#ifndef     _IXFATTRLIST_HXX
-#define     _IXFATTRLIST_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFATTRLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFATTRLIST_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -83,6 +83,6 @@ public:
     virtual void    Clear() = 0;
 };
 
-#endif  //_IXFATTRLIST_HXX
+#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFATTRLIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/ixfcontent.hxx b/lotuswordpro/source/filter/xfilter/ixfcontent.hxx
index b18eeb257e90..87e08d346a9f 100644
--- a/lotuswordpro/source/filter/xfilter/ixfcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfcontent.hxx
@@ -57,8 +57,8 @@
  * @file
  * Interface for the all content object,ie. text,paragraph,picture,and so on.
  ************************************************************************/
-#ifndef     _IXFCONTENT_HXX
-#define     _IXFCONTENT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFCONTENT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFCONTENT_HXX
 
 #include "xfglobal.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/ixfobject.hxx b/lotuswordpro/source/filter/xfilter/ixfobject.hxx
index 150cfcca6dcb..5c84ee93c04d 100644
--- a/lotuswordpro/source/filter/xfilter/ixfobject.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfobject.hxx
@@ -57,8 +57,8 @@
  * @file
  * Interfer face for all object that will responsible for xml element output
  ************************************************************************/
-#ifndef     IXFOBJECT_INC
-#define     IXFOBJECT_INC
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFOBJECT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFOBJECT_HXX
 
 class IXFStream;
 /*************************************************************************
@@ -85,6 +85,6 @@ public:
     virtual void    ToXml(IXFStream     *pSaxStream) = 0;
 };
 
-#endif //IXFOBJECT_INC
+#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFOBJECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/ixfproperty.hxx b/lotuswordpro/source/filter/xfilter/ixfproperty.hxx
index f51925477b61..86c35d988486 100644
--- a/lotuswordpro/source/filter/xfilter/ixfproperty.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfproperty.hxx
@@ -57,8 +57,8 @@
  * @file
  * Property for styles. ie. Margins,shadow,columns and so on.
  ************************************************************************/
-#ifndef     _IXFPROPERTY_HXX
-#define     _IXFPROPERTY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFPROPERTY_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFPROPERTY_HXX
 
 #include "ixfobject.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/ixfstream.hxx b/lotuswordpro/source/filter/xfilter/ixfstream.hxx
index 75b6f17d9371..cc3c0494ef57 100644
--- a/lotuswordpro/source/filter/xfilter/ixfstream.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfstream.hxx
@@ -57,8 +57,8 @@
  * @file
  * Sax stream to export xml to SODC.
  ************************************************************************/
-#ifndef     _IXFSTREAM_INC
-#define     _IXFSTREAM_INC
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFSTREAM_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFSTREAM_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -107,5 +107,5 @@ public:
     virtual IXFAttrList*    GetAttrList() = 0;
 };
 
-#endif //_IXFSTREAM_INC
+#endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFSTREAM_HXX
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx
index 5309a2866e4b..c8c8d3fe5ff6 100644
--- a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Interfer for all style object.
  ************************************************************************/
-#ifndef     _IXFSTYLE_HXX
-#define     _IXFSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_IXFSTYLE_HXX
 
 #include "xfglobal.hxx"
 /**
diff --git a/lotuswordpro/source/filter/xfilter/xfannotation.hxx b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
index 26dfc20966d8..e5f739984b2b 100644
--- a/lotuswordpro/source/filter/xfilter/xfannotation.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
@@ -57,8 +57,8 @@
  * @file
  * Annotation object.
  ************************************************************************/
-#ifndef     _XFANNOTATION_HXX
-#define     _XFANNOTATION_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFANNOTATION_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFANNOTATION_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
index 04a13b976652..5fa1eea1d75c 100644
--- a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Line Arrow.
  ************************************************************************/
-#ifndef     _XFARROWSTYLE_HXX
-#define     _XFARROWSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFARROWSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFARROWSTYLE_HXX
 
 #include "xfstyle.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.hxx b/lotuswordpro/source/filter/xfilter/xfbase64.hxx
index fbea42484c38..23bdeb5074c6 100644
--- a/lotuswordpro/source/filter/xfilter/xfbase64.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbase64.hxx
@@ -57,8 +57,8 @@
  * @file
  * Base64 tool.
  ************************************************************************/
-#ifndef     _XFBASE64_HXX
-#define     _XFBASE64_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBASE64_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBASE64_HXX
 
 #include "xfglobal.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
index 80eaaf5d7453..2a78366e90d4 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
@@ -57,8 +57,8 @@
  * @file
  * Background image.
  ************************************************************************/
-#ifndef     _XFBGIMAGE_HXX
-#define     _XFBGIMAGE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBGIMAGE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBGIMAGE_HXX
 
 #include "xfstyle.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
index 29cc59c5182f..da9516703b88 100644
--- a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
@@ -57,8 +57,8 @@
  * @file
  * Bookmark ref.
  ************************************************************************/
-#ifndef     _XFBOOKMARK_HXX
-#define     _XFBOOKMARK_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBOOKMARK_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBOOKMARK_HXX
 
 #include "xfcontent.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.hxx b/lotuswordpro/source/filter/xfilter/xfborders.hxx
index d72c3198e01b..8080a8dcd329 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.hxx
@@ -57,8 +57,8 @@
  * @file
  * Border object,now only used by paragraph object.
  ************************************************************************/
-#ifndef     _XFBORDERS_HXX
-#define     _XFBORDERS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBORDERS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBORDERS_HXX
 
 #include "xfglobal.hxx"
 #include "xfcolor.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
index fcf45d52feb3..5d0a84d37768 100644
--- a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
@@ -57,8 +57,8 @@
  * @file
  * Breaks of paragraph.
  ************************************************************************/
-#ifndef     _XFBREAKS_HXX
-#define     _XFBREAKS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBREAKS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFBREAKS_HXX
 
 #include "xfglobal.hxx"
 #include "ixfproperty.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx
index 19818a188465..ed983c75ae32 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx
@@ -58,8 +58,8 @@
  * Table cell.
  ************************************************************************/
 
-#ifndef     _XFCell_HXX
-#define     _XFCell_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCELL_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCELL_HXX
 
 #include "xfcontent.hxx"
 #include "xfcontentcontainer.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
index 9bdb292ba802..a660f4f135ab 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Table cell style. Number format, string value, and so on...
  ************************************************************************/
-#ifndef     _XFCELLSTYLE_HXX
-#define     _XFCELLSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCELLSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCELLSTYLE_HXX
 
 #include "xfstyle.hxx"
 #include "xfcolor.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfchange.hxx b/lotuswordpro/source/filter/xfilter/xfchange.hxx
index 1ed94a9b53a1..74599eb39b5e 100644
--- a/lotuswordpro/source/filter/xfilter/xfchange.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfchange.hxx
@@ -61,8 +61,8 @@
  * Change History
  Jun 2005           Created
  ************************************************************************/
-#ifndef _XFCHANGE_HXX_
-#define _XFCHANGE_HXX_
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCHANGE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCHANGE_HXX
 
 #include "xfglobal.hxx"
 #include "ixfstream.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.hxx b/lotuswordpro/source/filter/xfilter/xfcolor.hxx
index e169e70f4e8a..688593daf4a0 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolor.hxx
@@ -57,8 +57,8 @@
  * @file
  * Color object to serial to xml filter.
  ************************************************************************/
-#ifndef     _XFCOLOR_HXX
-#define     _XFCOLOR_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLOR_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLOR_HXX
 
 #include "xfglobal.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx
index 2986e888737a..490193a445d5 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Column style object.
  ************************************************************************/
-#ifndef     _XFCOLSTYLE_HXX
-#define     _XFCOLSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLSTYLE_HXX
 
 #include "xfstyle.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
index d4ff9c222b73..5cda6829c783 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
@@ -57,8 +57,8 @@
  * @file
  * Columns styles for section, or paragraph.
  ************************************************************************/
-#ifndef     _XFCOLUMNS_HXX
-#define     _XFCOLUMNS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLUMNS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCOLUMNS_HXX
 
 #include "xfglobal.hxx"
 #include "xfcolor.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
index c467d18ddfd9..c48e37bcb893 100644
--- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
@@ -57,8 +57,8 @@
  * @file
  * Manager for all config object,include line number config.
  ************************************************************************/
-#ifndef     _XFCONFIGMANAGER_HXX
-#define     _XFCONFIGMANAGER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONFIGMANAGER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONFIGMANAGER_HXX
 
 #include "xfstylecont.hxx"
 #include "xflinenumberconfig.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfcontent.hxx b/lotuswordpro/source/filter/xfilter/xfcontent.hxx
index a0e23b6c2020..30695edf8fc0 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontent.hxx
@@ -57,8 +57,8 @@
  * @file
  * Base class for the all content object,ie. text,paragraph,picture,and so on.
  ************************************************************************/
-#ifndef     _XFCONTENT_HXX
-#define     _XFCONTENT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENT_HXX
 
 #include "ixfcontent.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
index e5d495ab9bb0..858f0b92b612 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
@@ -57,8 +57,8 @@
  * @file
  * Container for content.It will destroy all children when destroy.
  ************************************************************************/
-#ifndef     _XFCONTENTCONTAINER_HXX
-#define     _XFCONTENTCONTAINER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENTCONTAINER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCONTENTCONTAINER_HXX
 
 #include "xfcontent.hxx"
 #include <vector>
diff --git a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
index 684aafaf5b8d..feaef993b4ef 100644
--- a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
@@ -57,8 +57,8 @@
  * @file
  * cross reference object.
  ************************************************************************/
-#ifndef     _XFCROSSREF_HXX
-#define     _XFCROSSREF_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCROSSREF_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFCROSSREF_HXX
 
 #include "xfcontent.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx
index 859b4a43fa0f..17f1d1960575 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx
@@ -57,8 +57,8 @@
  * @file
  * Date field with date style.
  ************************************************************************/
-#ifndef     _XFDATE_HXX
-#define     _XFDATE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDATE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDATE_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
index 403575603981..c4d1fd1b1a84 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Date style. The date format for date field.
  ************************************************************************/
-#ifndef     _XFDATESTYLE_HXX
-#define     _XFDATESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDATESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDATESTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfdefs.hxx b/lotuswordpro/source/filter/xfilter/xfdefs.hxx
index 5db73f541dd2..8200a8a7b044 100644
--- a/lotuswordpro/source/filter/xfilter/xfdefs.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdefs.hxx
@@ -57,8 +57,8 @@
  * @file
  * enum const defines.
  ************************************************************************/
-#ifndef     _XFDEFS_HXX
-#define     _XFDEFS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDEFS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDEFS_HXX
 
 #include "sal/types.h"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
index 56469661c3a6..56928a5f26e3 100644
--- a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
@@ -57,8 +57,8 @@
  * @file
  * doc field.
  ************************************************************************/
-#ifndef     _XFDOCFIELD_HXX
-#define     _XFDOCFIELD_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDOCFIELD_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDOCFIELD_HXX
 
 #include "xfcontent.hxx"
 #include "xfpagecount.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
index d9e2b8888400..907937582481 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
@@ -58,8 +58,8 @@
  * Area style of Drawing object.
  * Only support fill color and fill pattern now.
  ************************************************************************/
-#ifndef     _XFDRAWAREASTYLE_HXX
-#define     _XFDRAWAREASTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWAREASTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWAREASTYLE_HXX
 
 #include "xfstyle.hxx"
 #include "xfcolor.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx b/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx
index e2a0036d1fbb..d97ae140fa43 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx
@@ -57,8 +57,8 @@
  * @file
  * Group of drawing objects.
  ************************************************************************/
-#ifndef     _XFDRAWGROUP_HXX
-#define     _XFDRAWGROUP_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWGROUP_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWGROUP_HXX
 
 #include "xfdrawobj.hxx"
 #include "xfframe.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.hxx b/lotuswordpro/source/filter/xfilter/xfdrawline.hxx
index 73c3cd8703bd..266e76030686 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawline.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawline.hxx
@@ -57,8 +57,8 @@
  * @file
  * Line object.
  ************************************************************************/
-#ifndef     _XFDRAWLINE_HXX
-#define     _XFDRAWLINE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWLINE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWLINE_HXX
 
 #include "xfdrawobj.hxx"
 #include "xfpoint.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
index 93e9c9871236..06db32b3b23a 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Line style of Drawing object.
  ************************************************************************/
-#ifndef     _XFDRAWLINESTYLE_HXX
-#define     _XFDRAWLINESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWLINESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWLINESTYLE_HXX
 
 #include "xfstyle.hxx"
 #include "xfcolor.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
index b100bac7ab34..9df2831bf380 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
@@ -57,8 +57,8 @@
  * @file
  * Interfer for all Drawing object.
  ************************************************************************/
-#ifndef     _XFDRAWOBJ_HXX
-#define     _XFDRAWOBJ_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWOBJ_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWOBJ_HXX
 
 #include "xfframe.hxx"
 #include "xfrect.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
index be61b0c5c09b..51859b952005 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
@@ -57,8 +57,8 @@
  * @file
  * Draw path object.
  ************************************************************************/
-#ifndef     _XFDRAWPATH_HXX
-#define     _XFDRAWPATH_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPATH_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPATH_HXX
 
 #include "xfdrawobj.hxx"
 #include <vector>
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx
index a909a0cc9ea7..60ceb5df485e 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.hxx
@@ -57,8 +57,8 @@
  * @file
  * Polygon object.
  ************************************************************************/
-#ifndef     _XFPOLYGON_HXX
-#define     _XFPOLYGON_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPOLYGON_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPOLYGON_HXX
 
 #include "xfdrawpolyline.hxx"
 #include <vector>
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx
index 3d1b9a451c03..d7b7b994ba35 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx
@@ -57,8 +57,8 @@
  * @file
  * Polyline.
  ************************************************************************/
-#ifndef     _XFPOLYLINE_HXX
-#define     _XFPOLYLINE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPOLYLINE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWPOLYLINE_HXX
 
 #include "xfdrawobj.hxx"
 #include <vector>
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx b/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx
index df567c7ec945..0dab2ef81873 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx
@@ -57,8 +57,8 @@
  * @file
  * Rect object.
  ************************************************************************/
-#ifndef     _XFDRAWRECT_HXX
-#define     _XFDRAWRECT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWRECT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWRECT_HXX
 
 #include "xfdrawobj.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
index 928eb680960b..1183d7ce51df 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Style for all draw object.
  ************************************************************************/
-#ifndef     _XFDRAWSTYLE_HXX
-#define     _XFDRAWSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDRAWSTYLE_HXX
 
 #include "xfstyle.hxx"
 #include "xfcolor.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
index 02c7e03b51ef..916356c1e1be 100644
--- a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
@@ -57,8 +57,8 @@
  * @file
  * Drop cap of a paragraph.
  ************************************************************************/
-#ifndef     _XFDROPCAP_HXX
-#define     _XFDROPCAP_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDROPCAP_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFDROPCAP_HXX
 
 #include "xfglobal.hxx"
 #include "ixfproperty.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx b/lotuswordpro/source/filter/xfilter/xfendnote.hxx
index acd48c6647e5..1f44edcb1239 100644
--- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfendnote.hxx
@@ -57,8 +57,8 @@
  * @file
  * End note object.
  ************************************************************************/
-#ifndef     _XFENDNOTE_HXX
-#define     _XFENDNOTE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENDNOTE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENDNOTE_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx
index 87edffb05a71..5d7167788df9 100644
--- a/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx
@@ -57,8 +57,8 @@
  * @file
  * Endnote config.
  ************************************************************************/
-#ifndef     _XFENDNOTECONFIG_HXX
-#define     _XFENDNOTECONFIG_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENDNOTECONFIG_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENDNOTECONFIG_HXX
 
 #include "xfendnoteconfig.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/source/filter/xfilter/xfentry.hxx
index cc04bbb41efd..451effb1a5b9 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfentry.hxx
@@ -57,8 +57,8 @@
  * @file
  * index entry object.
  ************************************************************************/
-#ifndef     _XFENTRY_HXX
-#define     _XFENTRY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENTRY_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFENTRY_HXX
 
 #include "xfcontent.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
index cae4d39dad3d..8903f776cfd8 100644
--- a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
@@ -57,8 +57,8 @@
  * @file
  * Float frame whose anchor is page.
  ************************************************************************/
-#ifndef     _XFFLOATFRAME_HXX
-#define     _XFFLOATFRAME_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFLOATFRAME_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFLOATFRAME_HXX
 
 #include "xfframe.hxx"
 #include <vector>
diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx
index 504f952d897c..1dd08ee60c81 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.hxx
@@ -57,8 +57,8 @@
  * @file
  * Font object to serial to xml filter.
  ************************************************************************/
-#ifndef     _XFFONT_HXX
-#define     _XFFONT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONT_HXX
 
 #include "xfglobal.hxx"
 #include "xfcolor.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
index 8b5aaa23a6e2..8b28f65817e2 100644
--- a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
@@ -58,8 +58,8 @@
  * Font declaration for OOo xml file.This is needed for every font that was
  * used.
  ************************************************************************/
-#ifndef     _XFFONTDECL_HXX
-#define     _XFFONTDECL_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTDECL_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTDECL_HXX
 
 #include "xfglobal.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.hxx b/lotuswordpro/source/filter/xfilter/xffontfactory.hxx
index 4ab2a4b15400..7cc979fa2e0f 100644
--- a/lotuswordpro/source/filter/xfilter/xffontfactory.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffontfactory.hxx
@@ -57,8 +57,8 @@
  * @file
  * Factory object for XFFont.It also manages all font life cycle.
  ************************************************************************/
-#ifndef     _XFFONTFACTORY_HXX
-#define     _XFFONTFACTORY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTFACTORY_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTFACTORY_HXX
 
 #include "xfglobal.hxx"
 #include "xffont.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
index 0b69b5e3b903..5ef92e16c56c 100644
--- a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Style of Fontwork object.
  ************************************************************************/
- #ifndef _XFFONTWORKSTYLE_HXX
- #define _XFFONTWORKSTYLE_HXX
+ #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX
+ #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX
 
 #include "xfstyle.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xffooter.hxx b/lotuswordpro/source/filter/xfilter/xffooter.hxx
index d626b34897f2..1ab5e0851fd8 100644
--- a/lotuswordpro/source/filter/xfilter/xffooter.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffooter.hxx
@@ -57,8 +57,8 @@
  * @file
  * Footer object.
  ************************************************************************/
-#ifndef     _XFFOOTER_HXX
-#define     _XFFOOTER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTER_HXX
 
 #include "xfcontentcontainer.hxx"
 #include <vector>
diff --git a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx b/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx
index f72ed67479e8..e9babde27227 100644
--- a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Footer style,exist in page-master object.
  ************************************************************************/
-#ifndef     _XFFOOTERSTYLE_HXX
-#define     _XFFOOTERSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTERSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTERSTYLE_HXX
 
 #include "xfheaderstyle.hxx"
 #include "xfmargins.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xffootnote.hxx b/lotuswordpro/source/filter/xfilter/xffootnote.hxx
index 7c5136fb981b..44f65a68c42c 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnote.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnote.hxx
@@ -57,8 +57,8 @@
  * @file
  * Foot note object.
  ************************************************************************/
-#ifndef     _XFFOOTNOTE_HXX
-#define     _XFFOOTNOTE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTNOTE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTNOTE_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
index bc8ab9f738a3..96b674e47c9c 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
@@ -57,8 +57,8 @@
  * @file
  * Footnote config.
  ************************************************************************/
-#ifndef     _XFFOOTNOTECONFIG_HXX
-#define     _XFFOOTNOTECONFIG_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTNOTECONFIG_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFOOTNOTECONFIG_HXX
 
 #include "xfstyle.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx
index 2741f826edc0..0cae4304cd82 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx
@@ -58,8 +58,8 @@
  * Frame object for OOo.This is the basic object for all Shape Layer.
  * You can reference to the XFFrame object.
  ************************************************************************/
-#ifndef     _XFFRAME_HXX
-#define     _XFFRAME_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFRAME_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFRAME_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
index 6975d6c31611..9224af8f1141 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
@@ -58,8 +58,8 @@
  * Frame object style for OOo.
  * You can reference to the XFFrame object.
  ************************************************************************/
-#ifndef     _XFFRAMESTYLE_HXX
-#define     _XFFRAMESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFRAMESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFRAMESTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.hxx b/lotuswordpro/source/filter/xfilter/xfglobal.hxx
index caa8b0a578f4..5b49f4bda812 100644
--- a/lotuswordpro/source/filter/xfilter/xfglobal.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfglobal.hxx
@@ -58,8 +58,8 @@
  * Global functions or include files that are needed.
  * It's all for the full filter.
  ************************************************************************/
-#ifndef     _GLOBAL_HXX
-#define     _GLOBAL_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFGLOBAL_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFGLOBAL_HXX
 
 #include <cassert>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfheader.hxx b/lotuswordpro/source/filter/xfilter/xfheader.hxx
index 6802a0ec94d1..9a4773a9d07c 100644
--- a/lotuswordpro/source/filter/xfilter/xfheader.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfheader.hxx
@@ -57,8 +57,8 @@
  * @file
  * Header object. Sub object of master page.
  ************************************************************************/
-#ifndef     _XFHEADER_HXX
-#define     _XFHEADER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHEADER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHEADER_HXX
 
 #include "xfcontentcontainer.hxx"
 #include "xfparagraph.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
index f47dd4ec0d7a..c6a393fbf978 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Header style,exist in page-master object.
  ************************************************************************/
-#ifndef     _XFHEADERSTYLE_HXX
-#define     _XFHEADERSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHEADERSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHEADERSTYLE_HXX
 
 #include "xfstyle.hxx"
 #include "xfmargins.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
index 5795b945e25d..d45076ad7b56 100644
--- a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
@@ -57,8 +57,8 @@
  * @file
  * Hyperlink object for OOo xml filter.
  ************************************************************************/
-#ifndef     _XFHYPERLINK_HXX
-#define     _XFHYPERLINK_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHYPERLINK_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFHYPERLINK_HXX
 
 class XFHyperlink : public XFContent
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.hxx b/lotuswordpro/source/filter/xfilter/xfimage.hxx
index 3e27fac36cea..060cc10a34e6 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.hxx
@@ -57,8 +57,8 @@
  * @file
  * Image object.
  ************************************************************************/
-#ifndef     _XFIMAGE_HXX
-#define     _XFIMAGE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFIMAGE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFIMAGE_HXX
 
 #include "xfframe.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
index 6c78e48792ff..3f3bcb64c21c 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Image style object.
  ************************************************************************/
-#ifndef     _XFIMAGESTYLE_HXX
-#define     _XFIMAGESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFIMAGESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFIMAGESTYLE_HXX
 
 #include "xfframestyle.hxx"
 #include "xfrect.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx
index 4d911260aefc..33860e590934 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx
@@ -57,8 +57,8 @@
  * @file
  * Represente index source,index body and index index entry.
  ************************************************************************/
-#ifndef     _XFINDEX_HXX
-#define     _XFINDEX_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFINDEX_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFINDEX_HXX
 #include <map>
 #include <vector>
 
diff --git a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
index d9e6da3b4015..c903c5a8f560 100644
--- a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
@@ -57,8 +57,8 @@
  * @file
  * input list field.
  ************************************************************************/
-#ifndef     _XFINPUTLIST_HXX
-#define     _XFINPUTLIST_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFINPUTLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFINPUTLIST_HXX
 
 #include "xfcontent.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xflinebreak.hxx b/lotuswordpro/source/filter/xfilter/xflinebreak.hxx
index ea5bd06edc75..1be4bb1e8a16 100644
--- a/lotuswordpro/source/filter/xfilter/xflinebreak.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflinebreak.hxx
@@ -57,8 +57,8 @@
  * @file
  * Line break object,<text:line-break/>
  *************************************************************************/
-#ifndef     _XFLINEBREAK_HXX
-#define     _XFLINEBREAK_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINEBREAK_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINEBREAK_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xflineheight.hxx b/lotuswordpro/source/filter/xfilter/xflineheight.hxx
index be9f3082df53..d6c35b402510 100644
--- a/lotuswordpro/source/filter/xfilter/xflineheight.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflineheight.hxx
@@ -57,8 +57,8 @@
  * @file
  * Line height for paragraph.
  ************************************************************************/
-#ifndef     _XFLINEHEIGHT_HXX
-#define     _XFLINEHEIGHT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINEHEIGHT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINEHEIGHT_HXX
 
 #include <string.h>
 
diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
index 5fdbe669baea..6795a90595f7 100644
--- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
@@ -57,8 +57,8 @@
  * @file
  * Line numbering config for the full document.
  ************************************************************************/
-#ifndef     _XFLINENUMBERCONFIG_HXX
-#define     _XFLINENUMBERCONFIG_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINENUMBERCONFIG_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLINENUMBERCONFIG_HXX
 
 #include "xfstyle.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx
index 4525ec3178df..03501a2ded1f 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.hxx
@@ -57,8 +57,8 @@
  * @file
  * Base list object.
  ************************************************************************/
-#ifndef     _XFLIST_HXX
-#define     _XFLIST_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLIST_HXX
 
 #include "xflistitem.hxx"
 #include "xfcontentcontainer.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xflistitem.hxx b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
index d1e5bd5dad02..7bcb17e77959 100644
--- a/lotuswordpro/source/filter/xfilter/xflistitem.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
@@ -57,8 +57,8 @@
  * @file
  * List item.
  ************************************************************************/
-#ifndef     _XFLISTITEM_HXX
-#define     _XFLISTITEM_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLISTITEM_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLISTITEM_HXX
 
 #include "xfcontent.hxx"
 #include "xfcontentcontainer.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
index fa18887c1a54..d8ea1b52e4bf 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
@@ -57,8 +57,8 @@
 * @file
 * Styles for ordered list and unordered list.
 ************************************************************************/
-#ifndef     _XFLISTSTYLE_HXX
-#define     _XFLISTSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLISTSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFLISTSTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.hxx b/lotuswordpro/source/filter/xfilter/xfmargins.hxx
index 6ac13ce09bef..aed52b27de5c 100644
--- a/lotuswordpro/source/filter/xfilter/xfmargins.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmargins.hxx
@@ -57,8 +57,8 @@
  * @file
  * Margins object, include left margin,right margin,top margin and bottom margin.
  ************************************************************************/
-#ifndef     _XFMARGINS_HXX
-#define     _XFMARGINS_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFMARGINS_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFMARGINS_HXX
 
 #include "xfglobal.hxx"
 #include "ixfproperty.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
index 63604bbf343b..0cc7b58c045e 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
@@ -57,8 +57,8 @@
  * @file
  * Master page object which was used to apply a layout to the pages.
  ************************************************************************/
-#ifndef     _XFMASTERPAGE_HXX
-#define     _XFMASTERPAGE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFMASTERPAGE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFMASTERPAGE_HXX
 
 #include "xfstyle.hxx"
 #include "xfcontentcontainer.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
index 874fe63ec302..3176f13491aa 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Number style for table cell.
  ************************************************************************/
-#ifndef     _XFNUMBERSTYLE_HXX
-#define     _XFNUMBERSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFNUMBERSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFNUMBERSTYLE_HXX
 
 #include "xfstyle.hxx"
 #include "xfstylemanager.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
index e0dbcc6a9c0e..f7ea75f4ed31 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
@@ -57,8 +57,8 @@
  * @file
  * Number format. a),A),i),1),(1)
  ************************************************************************/
-#ifndef     _XFNUMFMT_HXX
-#define     _XFNUMFMT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFNUMFMT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFNUMFMT_HXX
 
 #include "xfglobal.hxx"
 #include "ixfproperty.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
index 2c114cbf1b54..f8e2f4ccc564 100644
--- a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
@@ -58,8 +58,8 @@
  * Meta info for the full document.
  * You can see this by click: File->Properties.
  ************************************************************************/
-#ifndef     _XFOFFICEMETA_HXX
-#define     _XFOFFICEMETA_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFOFFICEMETA_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFOFFICEMETA_HXX
 
 #include "xfglobal.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfpadding.hxx b/lotuswordpro/source/filter/xfilter/xfpadding.hxx
index 0ead45b57a9b..a39c1252d1c6 100644
--- a/lotuswordpro/source/filter/xfilter/xfpadding.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpadding.hxx
@@ -57,8 +57,8 @@
  * @file
  * Padding for paragraph.
  ************************************************************************/
-#ifndef     _XFPADDING_HXX
-#define     _XFPADDING_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPADDING_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPADDING_HXX
 
 #include "xfglobal.hxx"
 #include "ixfproperty.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfpagecount.hxx b/lotuswordpro/source/filter/xfilter/xfpagecount.hxx
index 9c3347b178f7..8705cfa9638b 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagecount.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagecount.hxx
@@ -57,8 +57,8 @@
  * @file
  * Page number field.
  ************************************************************************/
-#ifndef     _XFPAGECOUNT_HXX
-#define     _XFPAGECOUNT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGECOUNT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGECOUNT_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
index 9fff8ae72645..d8e8d465b671 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx
@@ -58,8 +58,8 @@
  * Page master used bye XFMasterPage.
  * It is the real object to define header and footer of pages.
  ************************************************************************/
-#ifndef     _XFPAGEMASTER_HXX
-#define     _XFPAGEMASTER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGEMASTER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGEMASTER_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx b/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
index ad256033a797..c8b3d692f0fe 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
@@ -57,8 +57,8 @@
  * @file
  * Page number field.
  ************************************************************************/
-#ifndef     _XFPAGENUMBER_HXX
-#define     _XFPAGENUMBER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGENUMBER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPAGENUMBER_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
index 45c981928d88..5821c6c5be8f 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
@@ -57,8 +57,8 @@
  * @file
  * Paragraph object of OOo, it will output <text:p >...</text:p> element.
  ************************************************************************/
-#ifndef     _XFPARAGRAPH_HXX
-#define     _XFPARAGRAPH_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPARAGRAPH_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPARAGRAPH_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontentcontainer.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index 4bbcca5d302b..766f402bd5a3 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -59,8 +59,8 @@
  * Styles for paragraph may include many style,include font,indent,margin,
  * shadow,line height,and so on.
  ************************************************************************/
-#ifndef     _XFPARASTYLE_HXX
-#define     _XFPARASTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPARASTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPARASTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
index 7a11097840c3..e27c8dc2445d 100644
--- a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
@@ -57,8 +57,8 @@
  * @file
  * place holder object.
  ************************************************************************/
-#ifndef     _XFPLACEHOLDER_HXX
-#define     _XFPLACEHOLDER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPLACEHOLDER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPLACEHOLDER_HXX
 
 #include "xfcontent.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfpoint.hxx b/lotuswordpro/source/filter/xfilter/xfpoint.hxx
index bf6d9fd35c9f..47a03e572bf1 100644
--- a/lotuswordpro/source/filter/xfilter/xfpoint.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpoint.hxx
@@ -57,8 +57,8 @@
  * @file
  * Reperesent a point.
  ************************************************************************/
-#ifndef     _XFPOINT_HXX
-#define     _XFPOINT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPOINT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFPOINT_HXX
 
 class XFPoint
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfrect.hxx b/lotuswordpro/source/filter/xfilter/xfrect.hxx
index 72e5534f0f09..7c1636424fc7 100644
--- a/lotuswordpro/source/filter/xfilter/xfrect.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrect.hxx
@@ -57,8 +57,8 @@
  * @file
  * Rect object
  ************************************************************************/
-#ifndef     _XFRECT_HXX
-#define     _XFRECT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRECT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRECT_HXX
 
 #include "xfpoint.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.hxx b/lotuswordpro/source/filter/xfilter/xfrow.hxx
index f3babb20fa59..16a3c3c2c954 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.hxx
@@ -57,8 +57,8 @@
  * @file
  * Table row object. A table is consist by rows.
  ************************************************************************/
-#ifndef     _XFROW_HXX
-#define     _XFROW_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFROW_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFROW_HXX
 
 #include "xfcontent.hxx"
 #include <map>
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
index 0bbe8ef9b76d..78eca9cd372a 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Table row style, ie. table row height.
  ************************************************************************/
-#ifndef     _XFROWSTYLE_HXX
-#define     _XFROWSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFROWSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFROWSTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfruby.hxx b/lotuswordpro/source/filter/xfilter/xfruby.hxx
index 718d82b992b9..91bc26ceeab1 100644
--- a/lotuswordpro/source/filter/xfilter/xfruby.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfruby.hxx
@@ -57,8 +57,8 @@
  * @file
  * ruby text.
  ************************************************************************/
-#ifndef     _XFRUBY_HXX
-#define     _XFRUBY_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRUBY_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRUBY_HXX
 
 #include "xfcontent.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
index 8719dc677208..6726eeb6d14b 100644
--- a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * ruby style.
  ************************************************************************/
-#ifndef     _XFRUBYSTYLE_HXX
-#define     _XFRUBYSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRUBYSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFRUBYSTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
index 9687bd616c95..defe6f399f52 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
@@ -57,8 +57,8 @@
  * @file
  * Wrapper the attibute list of a xml element.
  ************************************************************************/
-#ifndef     _XFSAXATTRLIST_HXX
-#define     _XFSAXATTRLIST_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXATTRLIST_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXATTRLIST_HXX
 
 #include "ixfattrlist.hxx"
 #include "xmloff/attrlist.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
index 648f4aaf2b92..7ccfb87f3de8 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
@@ -57,8 +57,8 @@
  * @file
  * Tool for sax writer.
  ************************************************************************/
-#ifndef     _XFSAXSTREAM_HXX
-#define     _XFSAXSTREAM_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXSTREAM_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSAXSTREAM_HXX
 
 #include "ixfstream.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx
index eb75dfe8876f..d75047f248f4 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx
@@ -57,8 +57,8 @@
  * @file
  * Section object.
  ************************************************************************/
-#ifndef     _XFSECTION_HXX
-#define     _XFSECTION_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSECTION_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSECTION_HXX
 
 #include "xfcontentcontainer.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
index 8a4234a65c62..aaa8474ba647 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Section style,whose family is "section"
  ************************************************************************/
-#ifndef     _XFSECTIONSTYLE_HXX
-#define     _XFSECTIONSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSECTIONSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSECTIONSTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
index 4f0f19ce0c14..7300546cf3e2 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
@@ -57,8 +57,8 @@
  * @file
  * Shadow object,now only used by paragraph object.
  ************************************************************************/
-#ifndef     _XFSHADOW_HXX
-#define     _XFSHADOW_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSHADOW_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSHADOW_HXX
 
 #include "xfglobal.hxx"
 #include "ixfproperty.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
index 89e251a16d87..6c1d28851d12 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Base style object .
  ************************************************************************/
-#ifndef     _XFSTYLE_HXX
-#define     _XFSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLE_HXX
 
 #include "ixfstyle.hxx"
 
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
index 1b4edb323743..8c477722909b 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
@@ -57,8 +57,8 @@
  * @file
  * Style container,which response for special style,ie. text style.
  ************************************************************************/
-#ifndef     _XFSTYLECONTAINER_HXX
-#define     _XFSTYLECONTAINER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLECONT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLECONT_HXX
 
 #include "xfglobal.hxx"
 #include <vector>
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx
index db22ac10803e..5f03f55582c0 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx
@@ -57,8 +57,8 @@
  * @file
  * Style manager for the filter.
  ************************************************************************/
-#ifndef     _XFSTYLEMANAGER_HXX
-#define     _XFSTYLEMANAGER_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLEMANAGER_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFSTYLEMANAGER_HXX
 
 #include "xfglobal.hxx"
 #include "xffontdecl.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx
index 9c05a074d2cc..7210df3730e7 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.hxx
@@ -57,8 +57,8 @@
  * @file
  * Table object.
  ************************************************************************/
-#ifndef     _XFTABLE_HXX
-#define     _XFTABLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABLE_HXX
 
 #include "xfcontent.hxx"
 #include "xfrow.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx b/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
index ff0c7b559b04..335202389852 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Table style.
  ************************************************************************/
-#ifndef     _XFTABLESTYLE_HXX
-#define     _XFTABLESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABLESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABLESTYLE_HXX
 
 #include "xfstyle.hxx"
 #include "xfmargins.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xftabstop.hxx b/lotuswordpro/source/filter/xfilter/xftabstop.hxx
index b4aef7e38150..e2a5208fd40d 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstop.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstop.hxx
@@ -57,8 +57,8 @@
  * @file
  * Tab stop object,<text:tab-stop/>
  *************************************************************************/
-#ifndef     _XFTABSTOP_HXX
-#define     _XFTABSTOP_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABSTOP_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABSTOP_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
index 6d29398fd832..00ded1e699ce 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Tab style for paragraph.include tab offset and tab char properties.
  ************************************************************************/
-#ifndef     _XFTABSSTYLE_HXX
-#define     _XFTABSSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTABSTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx b/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx
index 2ad8acd471c1..08005c591412 100644
--- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx
@@ -53,8 +53,8 @@
  *
  *
  ************************************************************************/
-#ifndef     _XFTEXTBOXSTYLE_HXX
-#define     _XFTEXTBOXSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTBOXSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTBOXSTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
index 3550216d9965..c7894fb9ff52 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
@@ -57,8 +57,8 @@
  * @file
  * Text content, it's an adapter for string to IXFObject.
  ************************************************************************/
-#ifndef     _XFTEXTCONTENT_HXX
-#define     _XFTEXTCONTENT_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTCONTENT_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTCONTENT_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.hxx b/lotuswordpro/source/filter/xfilter/xftextspan.hxx
index b7142b6629f0..5bcd80d6c695 100644
--- a/lotuswordpro/source/filter/xfilter/xftextspan.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextspan.hxx
@@ -57,8 +57,8 @@
  * @file
  * An span of text with style.
  ************************************************************************/
-#ifndef     _XFTEXTSPAN_HXX
-#define     _XFTEXTSPAN_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTSPAN_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTSPAN_HXX
 
 #include "xfglobal.hxx"
 #include "xfcontent.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
index 625c94d4e23f..b7f7312c1655 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx
@@ -58,8 +58,8 @@
  * Style for <text:p> or <text:h> or <text:span>
  * Now we have only font attributes.
  ************************************************************************/
-#ifndef     _XFTEXTSTYLE_HXX
-#define     _XFTEXTSTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTSTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTEXTSTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
index 58a20a282379..6bbac0c0c78f 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
@@ -57,8 +57,8 @@
  * @file
  * Time style. The TIme format for time field.
  ************************************************************************/
-#ifndef     _XFTIMESTYLE_HXX
-#define     _XFTIMESTYLE_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTIMESTYLE_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFTIMESTYLE_HXX
 
 #include "xfglobal.hxx"
 #include "xfstyle.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx
index 0ea5f8725587..32a1ec311e5d 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx
@@ -58,8 +58,8 @@
  * Tool funtions for xml filter.
  * Don't use any template for the ***TOOUString function list for easy.
  ************************************************************************/
-#ifndef     _XFUTIL_HXX
-#define     _XFUTIL_HXX
+#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFUTIL_HXX
+#define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFUTIL_HXX
 
 #include "xfdefs.hxx"
 #include <rtl/ustring.hxx>
author	Thomas Arnhold <thomas@arnhold.org>	2014-04-18 22:11:40 +0200
committer	Thomas Arnhold <thomas@arnhold.org>	2014-04-19 11:10:11 +0200
commit	edf23912c5dbdadd532f0965dade97b71962e9bc (patch)
tree	045104ddbfc3c6dcdf31667780738e05275fcbcf /lotuswordpro
parent	4cd139c313737066d02ac3c735feaa2f7001d365 (diff)