fixincludeguards.sh: xmloff

Change-Id: I0e7d9daac1ad88fad8d240373e91ef323966bb47
author: Thomas Arnhold <thomas@arnhold.org> 2013-10-23 19:30:56 +0200
committer: Thomas Arnhold <thomas@arnhold.org> 2013-10-23 23:22:32 +0200
commit: a45953ed7c69a33dbe6609e85770b29da29a2167 (patch)
tree: 9239d88c1decc6cba9b7f3584284e0650eb7391f /xmloff
parent: 9e775eee3ec964806209656509446b7e1bb92063 (diff)
286 files changed, 738 insertions, 739 deletions
diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx
index 2cd36e1e08ac..d434d943581b 100644
--- a/xmloff/inc/AttributeContainerHandler.hxx
+++ b/xmloff/inc/AttributeContainerHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ATTRIBUTECONTAINERHANDLER_HXX
-#define _XMLOFF_ATTRIBUTECONTAINERHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -36,6 +36,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_ATTRIBUTECONTAINERHANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index 34dc52a849ae..0de3c493cfe6 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_DOMBUILDERCONTEXT_HXX
-#define _XMLOFF_DOMBUILDERCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_DOMBUILDERCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_DOMBUILDERCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx
index a1b0b799e344..6f88dc3bafb9 100644
--- a/xmloff/inc/DomExport.hxx
+++ b/xmloff/inc/DomExport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_DOMEXPORT_HXX
-#define _XMLOFF_DOMEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_DOMEXPORT_HXX
+#define INCLUDED_XMLOFF_INC_DOMEXPORT_HXX
 
 // the Solaris compiler apparently needs the following include:
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/inc/EnhancedCustomShapeToken.hxx b/xmloff/inc/EnhancedCustomShapeToken.hxx
index 573bd917e993..dafe8b8ec8ec 100644
--- a/xmloff/inc/EnhancedCustomShapeToken.hxx
+++ b/xmloff/inc/EnhancedCustomShapeToken.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENHANCED_CUSTOMSHAPE_TOKEN_HXX
-#define _ENHANCED_CUSTOMSHAPE_TOKEN_HXX
+#ifndef INCLUDED_XMLOFF_INC_ENHANCEDCUSTOMSHAPETOKEN_HXX
+#define INCLUDED_XMLOFF_INC_ENHANCEDCUSTOMSHAPETOKEN_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx
index f9cd2af67982..54d6ca69f538 100644
--- a/xmloff/inc/MetaExportComponent.hxx
+++ b/xmloff/inc/MetaExportComponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_METAEXPORTCOMPONENT_HXX
-#define _XMLOFF_METAEXPORTCOMPONENT_HXX
+#ifndef INCLUDED_XMLOFF_INC_METAEXPORTCOMPONENT_HXX
+#define INCLUDED_XMLOFF_INC_METAEXPORTCOMPONENT_HXX
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
diff --git a/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx
index 42b53aed3fe5..dc03112d85b3 100644
--- a/xmloff/inc/MetaImportComponent.hxx
+++ b/xmloff/inc/MetaImportComponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_METAIMPORTCOMPONENT_HXX
-#define _XMLOFF_METAIMPORTCOMPONENT_HXX
+#ifndef INCLUDED_XMLOFF_INC_METAIMPORTCOMPONENT_HXX
+#define INCLUDED_XMLOFF_INC_METAIMPORTCOMPONENT_HXX
 
 #include <xmloff/xmlimp.hxx>
 
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index c73ebd7fc220..a6d6da846069 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_CONDITIONALMULTIPROPERTYSETHELPER_HXX
-#define _XMLOFF_CONDITIONALMULTIPROPERTYSETHELPER_HXX
+#ifndef INCLUDED_XMLOFF_INC_MULTIPROPERTYSETHELPER_HXX
+#define INCLUDED_XMLOFF_INC_MULTIPROPERTYSETHELPER_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx
index 7cfc6142a93b..752e12c8baba 100644
--- a/xmloff/inc/PageMasterImportContext.hxx
+++ b/xmloff/inc/PageMasterImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PAGEMASTERIMPORTCONTEXT_HXX
-#define _XMLOFF_PAGEMASTERIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_PAGEMASTERIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_PAGEMASTERIMPORTCONTEXT_HXX
 
 #include <xmloff/prstylei.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/inc/PropertySetMerger.hxx b/xmloff/inc/PropertySetMerger.hxx
index 3b622757c5c5..ff966caa2054 100644
--- a/xmloff/inc/PropertySetMerger.hxx
+++ b/xmloff/inc/PropertySetMerger.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYSETMERGER_HXX_
-#define _XMLOFF_PROPERTYSETMERGER_HXX_
+#ifndef INCLUDED_XMLOFF_INC_PROPERTYSETMERGER_HXX
+#define INCLUDED_XMLOFF_INC_PROPERTYSETMERGER_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx
index 2dd144089e78..dbc01337277b 100644
--- a/xmloff/inc/RDFaExportHelper.hxx
+++ b/xmloff/inc/RDFaExportHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RDFAEXPORTHELPER_HXX
-#define RDFAEXPORTHELPER_HXX
+#ifndef INCLUDED_XMLOFF_INC_RDFAEXPORTHELPER_HXX
+#define INCLUDED_XMLOFF_INC_RDFAEXPORTHELPER_HXX
 
 #include <com/sun/star/uno/Reference.h>
 
@@ -66,6 +66,6 @@ public:
 
 } // namespace xmloff
 
-#endif // RDFAEXPORTHELPER_HXX
+#endif // INCLUDED_XMLOFF_INC_RDFAEXPORTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx
index 6d710aa97fe3..9fdeaaaf98bd 100644
--- a/xmloff/inc/RDFaImportHelper.hxx
+++ b/xmloff/inc/RDFaImportHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RDFAIMPORTHELPER_HXX
-#define RDFAIMPORTHELPER_HXX
+#ifndef INCLUDED_XMLOFF_INC_RDFAIMPORTHELPER_HXX
+#define INCLUDED_XMLOFF_INC_RDFAIMPORTHELPER_HXX
 
 #include <vector>
 
@@ -90,6 +90,6 @@ public:
 
 } // namespace xmloff
 
-#endif // RDFAIMPORTHELPER_HXX
+#endif // INCLUDED_XMLOFF_INC_RDFAIMPORTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 9c97966f2455..01dea842f25a 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SCH_XMLEXPORT_HXX_
-#define SCH_XMLEXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_SCHXMLEXPORT_HXX
+#define INCLUDED_XMLOFF_INC_SCHXMLEXPORT_HXX
 
 #include <xmloff/SchXMLExportHelper.hxx>
 #include "SchXMLAutoStylePoolP.hxx"
@@ -63,6 +63,6 @@ public:
     virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
 };
 
-#endif  // SCH_XMLEXPORT_HXX_
+#endif // INCLUDED_XMLOFF_INC_SCHXMLEXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index b9e3c0aabe84..f531de380e39 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SCH_XMLIMPORT_HXX_
-#define SCH_XMLIMPORT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX
+#define INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX
 
 #include <xmloff/SchXMLImportHelper.hxx>
 #include <xmloff/xmlimp.hxx>
@@ -178,6 +178,6 @@ public:
     virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 };
 
-#endif  // SCH_XMLIMPORT_HXX_
+#endif // INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index f71b530a45f6..3425a0520928 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_STYLEMAP_HXX
-#define _XMLOFF_STYLEMAP_HXX
+#ifndef INCLUDED_XMLOFF_INC_STYLEMAP_HXX
+#define INCLUDED_XMLOFF_INC_STYLEMAP_HXX
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -83,6 +83,6 @@ public:
                 const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 };
 
-#endif  //  _XMLOFF_STYLEMAP_HXX
+#endif // INCLUDED_XMLOFF_INC_STYLEMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx
index f991cc83089b..5acdceeab1b8 100644
--- a/xmloff/inc/TransGradientStyle.hxx
+++ b/xmloff/inc/TransGradientStyle.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TRANSGRADIENTSTYLE_HXX
-#define _XMLOFF_TRANSGRADIENTSTYLE_HXX
+#ifndef INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX
+#define INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX
 
 
 #include <sal/types.h>
@@ -59,6 +59,6 @@ public:
     sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
 };
 
-#endif // _XMLOFF_TRANSGRADIENTSTYLE_HXX
+#endif // INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index 1f84f6520ed0..b4c7b732eb4f 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLBACKGROUNDIMAGECONTEXT_HXX
-#define _XMLBACKGROUNDIMAGECONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGECONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGECONTEXT_HXX
 
 #include <com/sun/star/style/GraphicLocation.hpp>
 #include "XMLElementPropertyContext.hxx"
diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx
index 3a2d8ed3d130..36c2291a3b0f 100644
--- a/xmloff/inc/XMLBackgroundImageExport.hxx
+++ b/xmloff/inc/XMLBackgroundImageExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLBACKGROUNDIMAGEEXPORT_HXX
-#define _XMLBACKGROUNDIMAGEEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGEEXPORT_HXX
+#define INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGEEXPORT_HXX
 
 #include <sal/types.h>
 
diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx
index 42b2ec05f1f4..d73df0ab3810 100644
--- a/xmloff/inc/XMLBase64Export.hxx
+++ b/xmloff/inc/XMLBase64Export.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLBASE64EXPORT_HXX
-#define _XMLOFF_XMLBASE64EXPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBASE64EXPORT_HXX
+#define INCLUDED_XMLOFF_INC_XMLBASE64EXPORT_HXX
 
 #include <com/sun/star/uno/Reference.h>
 
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index 1bd2c2ec46dc..62deddc47194 100644
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLBASICEXPORTFILTER_HXX
-#define _XMLOFF_XMLBASICEXPORTFILTER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
+#define INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -58,6 +58,6 @@ public:
         throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
 };
 
-#endif // _XMLOFF_XMLBASICEXPORTFILTER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
index e6e591a7944e..76d737a86ac3 100644
--- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -50,6 +50,6 @@ public:
             const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
index 2429a9ce9b1a..693e769701ed 100644
--- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -52,6 +52,6 @@ public:
             const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index f2726baf09ed..90438273f57b 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_CHARTPROPERTYSETMAPPER_HXX_
-#define _XMLOFF_CHARTPROPERTYSETMAPPER_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLCHARTPROPERTYSETMAPPER_HXX
+#define INCLUDED_XMLOFF_INC_XMLCHARTPROPERTYSETMAPPER_HXX
 
 #include <xmloff/uniref.hxx>
 #include <xmloff/xmlprmap.hxx>
@@ -111,6 +111,6 @@ public:
         sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const;
 };
 
-#endif  // _XMLOFF_CHARTPROPERTYSETMAPPER_HXX_
+#endif // INCLUDED_XMLOFF_INC_XMLCHARTPROPERTYSETMAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx
index 3caac13fd6c0..ca66f896cedb 100644
--- a/xmloff/inc/XMLChartStyleContext.hxx
+++ b/xmloff/inc/XMLChartStyleContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLCHARTSTYLECONTEXT_HXX_
-#define _XMLOFF_XMLCHARTSTYLECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX
 
 #include <xmloff/XMLShapeStyleContext.hxx>
 
@@ -56,6 +56,6 @@ public:
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
 };
 
-#endif  // _XMLOFF_XMLCHARTSTYLECONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx
index c690218bd7b8..2fe39d3047b0 100644
--- a/xmloff/inc/XMLClipPropertyHandler.hxx
+++ b/xmloff/inc/XMLClipPropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLCLIPPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLCLIPPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -37,6 +37,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx
index 5ce75fc013e8..49cdb131d248 100644
--- a/xmloff/inc/XMLElementPropertyContext.hxx
+++ b/xmloff/inc/XMLElementPropertyContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLELEMENTPROPERTYCONTEXT_HXX
-#define _XMLOFF_XMLELEMENTPROPERTYCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLELEMENTPROPERTYCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLELEMENTPROPERTYCONTEXT_HXX
 
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index 4c3d08b6df43..f32ee8ae83c0 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <xmloff/xmlictxt.hxx>
@@ -67,6 +67,6 @@ public:
 
 };
 
-#endif  //  _XMLOFF_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx
index 3ee55bc0e419..4dca7093f4d1 100644
--- a/xmloff/inc/XMLEventImportHelper.hxx
+++ b/xmloff/inc/XMLEventImportHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_EVENTIMPORTHELPER_HXX
-#define _XMLOFF_EVENTIMPORTHELPER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLEVENTIMPORTHELPER_HXX
+#define INCLUDED_XMLOFF_INC_XMLEVENTIMPORTHELPER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <xmloff/xmlevent.hxx>
diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
index 95dc21575573..f17d691e2c1c 100644
--- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -50,6 +50,6 @@ public:
             const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index a5e2fb272c5f..2822538c1c17 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLFOOTNOTECONFIGURATIONIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLFOOTNOTECONFIGURATIONIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLFOOTNOTECONFIGURATIONIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLFOOTNOTECONFIGURATIONIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlstyle.hxx>
 
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index ffacc723f735..d97b33560efe 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLIMAGEMAPCONTEXT_HXX_
-#define _XMLOFF_XMLIMAGEMAPCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLIMAGEMAPCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLIMAGEMAPCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx
index ceb132bbb731..3cdcef2837cb 100644
--- a/xmloff/inc/XMLImageMapExport.hxx
+++ b/xmloff/inc/XMLImageMapExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLIMAGEMAPEXPORT_HXX_
-#define _XMLOFF_XMLIMAGEMAPEXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLIMAGEMAPEXPORT_HXX
+#define INCLUDED_XMLOFF_INC_XMLIMAGEMAPEXPORT_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index cc0234e21ed0..8cd974bded71 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXBIBLIOGRAPHYCONFIGURATIONCONTEXT_HXX_
-#define _XMLOFF_XMLINDEXBIBLIOGRAPHYCONFIGURATIONCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLINDEXBIBLIOGRAPHYCONFIGURATIONCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLINDEXBIBLIOGRAPHYCONFIGURATIONCONTEXT_HXX
 
 #include <xmloff/xmlstyle.hxx>
 #include <xmloff/languagetagodf.hxx>
diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
index b7d4e74bd21c..6af26b385b08 100644
--- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
+++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLISPERCENTAGEPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLISPERCENTAGEPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLISPERCENTAGEPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLISPERCENTAGEPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index ae3e6dd17016..5eb2cf4b0e01 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLLINENUMBERINGIMPORTCONTEXT_HXX_
-#define _XMLOFF_XMLLINENUMBERINGIMPORTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLLINENUMBERINGIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLLINENUMBERINGIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlstyle.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index c7a2c941d01f..cf4c69996d2f 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_NUMBERSTYLESIMPORT_HXX
-#define _XMLOFF_NUMBERSTYLESIMPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLNUMBERSTYLESIMPORT_HXX
+#define INCLUDED_XMLOFF_INC_XMLNUMBERSTYLESIMPORT_HXX
 
 #include <xmloff/xmlnumfi.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -64,6 +64,6 @@ public:
     sal_Int32 GetDrawKey() const { return mnKey; }
 };
 
-#endif  //  _XMLOFF_NUMBERSTYLESIMPORT_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLNUMBERSTYLESIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
index 1b4e0e7735ba..995c95287896 100644
--- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
+++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLPERCENTORMEASUREPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLPERCENTORMEASUREPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLPERCENTORMEASUREPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLPERCENTORMEASUREPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx
index e216daf43a37..3e52e9336c63 100644
--- a/xmloff/inc/XMLRectangleMembersHandler.hxx
+++ b/xmloff/inc/XMLRectangleMembersHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLRECTANGLEMEMBERSHANDLER_HXX
-#define _XMLOFF_XMLRECTANGLEMEMBERSHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLRECTANGLEMEMBERSHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLRECTANGLEMEMBERSHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -52,6 +52,6 @@ public:
             const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_XMLRECTANGLEMEMBERSHANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLRECTANGLEMEMBERSHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index 419693d7784d..01035b094be7 100644
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLREPLACEMENTIMAGECONTEXT_HXX
-#define _XMLOFF_XMLREPLACEMENTIMAGECONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLREPLACEMENTIMAGECONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLREPLACEMENTIMAGECONTEXT_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <xmloff/xmlictxt.hxx>
@@ -60,6 +60,6 @@ public:
 
 };
 
-#endif  //  _XMLOFF_XMLREPLACEMENTIMAGECONTEXT_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLREPLACEMENTIMAGECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx
index d189a65b7db4..cbfe7c53a299 100644
--- a/xmloff/inc/XMLScriptContextFactory.hxx
+++ b/xmloff/inc/XMLScriptContextFactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSCRIPTCONTEXTFACTORY_HXX
-#define _XMLOFF_XMLSCRIPTCONTEXTFACTORY_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSCRIPTCONTEXTFACTORY_HXX
+#define INCLUDED_XMLOFF_INC_XMLSCRIPTCONTEXTFACTORY_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <xmloff/xmlevent.hxx>
@@ -55,6 +55,6 @@ public:
                   const OUString & rLanguage);
 };
 
-#endif // _XMLOFF_XMLSCRIPTCONTEXTFACTORY_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLSCRIPTCONTEXTFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx
index e1963e7e83c6..36380943893f 100644
--- a/xmloff/inc/XMLScriptExportHandler.hxx
+++ b/xmloff/inc/XMLScriptExportHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSCRIPTEXPORTHANDLER_HXX
-#define _XMLOFF_XMLSCRIPTEXPORTHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSCRIPTEXPORTHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLSCRIPTEXPORTHANDLER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx
index 54c28ca372c2..b66bec224c58 100644
--- a/xmloff/inc/XMLShapePropertySetContext.hxx
+++ b/xmloff/inc/XMLShapePropertySetContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLSHAPEPROPERTYSETCONTEXT_HXX
-#define _XMLOFF_XMLSHAPEPROPERTYSETCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSHAPEPROPERTYSETCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLSHAPEPROPERTYSETCONTEXT_HXX
 
 
 #include <xmloff/xmlprcon.hxx>
diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx
index a1db7963096f..9ce7aa60e869 100644
--- a/xmloff/inc/XMLStarBasicContextFactory.hxx
+++ b/xmloff/inc/XMLStarBasicContextFactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSTARBASICCONTEXTFACTORY_HXX
-#define _XMLOFF_XMLSTARBASICCONTEXTFACTORY_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSTARBASICCONTEXTFACTORY_HXX
+#define INCLUDED_XMLOFF_INC_XMLSTARBASICCONTEXTFACTORY_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <xmloff/xmlevent.hxx>
diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx
index 1ba34a9577ab..5d983c5d290c 100644
--- a/xmloff/inc/XMLStarBasicExportHandler.hxx
+++ b/xmloff/inc/XMLStarBasicExportHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSTARBASICEXPORTHANDLER_HXX
-#define _XMLOFF_XMLSTARBASICEXPORTHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSTARBASICEXPORTHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLSTARBASICEXPORTHANDLER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index d710de80e13e..378b4986c874 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLSTRINGBUFFERIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLSTRINGBUFFERIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSTRINGBUFFERIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLSTRINGBUFFERIMPORTCONTEXT_HXX
 
 
 #include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index 9ef0fc09e234..7f91a6e49ec6 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLTEXTCOLUMNSCONTEXT_HXX
-#define _XMLTEXTCOLUMNSCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSCONTEXT_HXX
 
 #include "XMLElementPropertyContext.hxx"
 
diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx
index c931b92298a1..65aaf09b6114 100644
--- a/xmloff/inc/XMLTextColumnsExport.hxx
+++ b/xmloff/inc/XMLTextColumnsExport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLTEXTCOLUMNSEXPORT_HXX
-#define _XMLOFF_XMLTEXTCOLUMNSEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSEXPORT_HXX
+#define INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSEXPORT_HXX
 
 namespace com { namespace sun { namespace star { namespace uno {
     class Any; } } } }
diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
index 41dad369d525..386d7bf8beaa 100644
--- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
+++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLTEXTCOLUMNSPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLTEXTCOLUMNSPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 18a407970cee..35184002ffb0 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_TEXTHEADERFOOTERCONTEXT_HXX_
-#define _XMLOFF_TEXTHEADERFOOTERCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLTEXTHEADERFOOTERCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLTEXTHEADERFOOTERCONTEXT_HXX
 
 
 #include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx
index 8f81891cbdc5..6bd96bb6d70d 100644
--- a/xmloff/inc/anim.hxx
+++ b/xmloff/inc/anim.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ANIM_HXX
-#define _XMLOFF_ANIM_HXX
+#ifndef INCLUDED_XMLOFF_INC_ANIM_HXX
+#define INCLUDED_XMLOFF_INC_ANIM_HXX
 
 #include <com/sun/star/presentation/AnimationEffect.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -92,6 +92,6 @@ extern SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[];
 void SdXMLImplSetEffect( ::com::sun::star::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn );
 ::com::sun::star::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn );
 
-#endif  //  _XMLOFF_ANIM_HXX
+#endif // INCLUDED_XMLOFF_INC_ANIM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index b905c8701ba8..08a78cf96126 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ANIMATIONIMPORT_HXX
-#define _XMLOFF_ANIMATIONIMPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_ANIMATIONIMPORT_HXX
+#define INCLUDED_XMLOFF_INC_ANIMATIONIMPORT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/animations/XAnimationNode.hpp>
@@ -59,6 +59,6 @@ public:
 
 }
 
-#endif  //  _XMLOFF_ANIMATIONIMPORT_HXX
+#endif // INCLUDED_XMLOFF_INC_ANIMATIONIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx
index 3a55350985da..2ff9f7688deb 100644
--- a/xmloff/inc/animations.hxx
+++ b/xmloff/inc/animations.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ANIMATIONS_HXX
-#define _XMLOFF_ANIMATIONS_HXX
+#ifndef INCLUDED_XMLOFF_INC_ANIMATIONS_HXX
+#define INCLUDED_XMLOFF_INC_ANIMATIONS_HXX
 
 #include <xmloff/xmltoken.hxx>
 
@@ -55,6 +55,6 @@ extern const struct ImplAttributeNameConversion* getAnimationAttributeNamesConve
 
 }
 
-#endif  //  _XMLOFF_ANIMATIONS_HXX
+#endif // INCLUDED_XMLOFF_INC_ANIMATIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index e0d45b92772b..529a048dda2d 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ANIMIMP_HXX
-#define _XMLOFF_ANIMIMP_HXX
+#ifndef INCLUDED_XMLOFF_INC_ANIMIMP_HXX
+#define INCLUDED_XMLOFF_INC_ANIMIMP_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
@@ -44,6 +44,6 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
-#endif  //  _XMLOFF_ANIMIMP_HXX
+#endif // INCLUDED_XMLOFF_INC_ANIMIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/forms/form_handler_factory.hxx b/xmloff/inc/forms/form_handler_factory.hxx
index f29a5f9c630e..5ad43b3a66b8 100644
--- a/xmloff/inc/forms/form_handler_factory.hxx
+++ b/xmloff/inc/forms/form_handler_factory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_FORM_HANDLER_FACTORY_HXX
-#define XMLOFF_FORM_HANDLER_FACTORY_HXX
+#ifndef INCLUDED_XMLOFF_INC_FORMS_FORM_HANDLER_FACTORY_HXX
+#define INCLUDED_XMLOFF_INC_FORMS_FORM_HANDLER_FACTORY_HXX
 
 #include "forms/property_handler.hxx"
 
@@ -34,6 +34,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_FORM_HANDLER_FACTORY_HXX
+#endif // INCLUDED_XMLOFF_INC_FORMS_FORM_HANDLER_FACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx
index a727f6b664f4..fb17d6054e8a 100644
--- a/xmloff/inc/forms/property_handler.hxx
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_PROPERTY_HANDLER_HXX
-#define XMLOFF_PROPERTY_HANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_FORMS_PROPERTY_HANDLER_HXX
+#define INCLUDED_XMLOFF_INC_FORMS_PROPERTY_HANDLER_HXX
 
 #include "forms/property_ids.hxx"
 
@@ -64,6 +64,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_PROPERTY_HANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_FORMS_PROPERTY_HANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/forms/property_ids.hxx b/xmloff/inc/forms/property_ids.hxx
index 48a06e67e88f..22b71239f426 100644
--- a/xmloff/inc/forms/property_ids.hxx
+++ b/xmloff/inc/forms/property_ids.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_PROPERTY_IDS_HXX
-#define XMLOFF_PROPERTY_IDS_HXX
+#ifndef INCLUDED_XMLOFF_INC_FORMS_PROPERTY_IDS_HXX
+#define INCLUDED_XMLOFF_INC_FORMS_PROPERTY_IDS_HXX
 
 namespace xmloff
 {
@@ -40,6 +40,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_PROPERTY_IDS_HXX
+#endif // INCLUDED_XMLOFF_INC_FORMS_PROPERTY_IDS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 30e607ba633b..050f9a0c04b4 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -21,8 +21,8 @@
  *  XML export of all text fields
  */
 
-#ifndef _XMLOFF_TXTFLDE_HXX
-#define _XMLOFF_TXTFLDE_HXX
+#ifndef INCLUDED_XMLOFF_INC_TXTFLDE_HXX
+#define INCLUDED_XMLOFF_INC_TXTFLDE_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include "xmloff/xmlnmspe.hxx"
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 81dcaafbe9a4..3ab7140948db 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -23,8 +23,8 @@
  *  (except variable related + database display field: see txtvfldi.hxx)
  */
 
-#ifndef _XMLOFF_TXTFLDI_HXX
-#define _XMLOFF_TXTFLDI_HXX
+#ifndef INCLUDED_XMLOFF_INC_TXTFLDI_HXX
+#define INCLUDED_XMLOFF_INC_TXTFLDI_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/text/PageNumberType.hpp>
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index bff6a0bedf96..447ffa7cf2ac 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TXTLISTS_HXX
-#define _XMLOFF_TXTLISTS_HXX
+#ifndef INCLUDED_XMLOFF_INC_TXTLISTS_HXX
+#define INCLUDED_XMLOFF_INC_TXTLISTS_HXX
 
 #include <rtl/ustring.hxx>
 #include <comphelper/stl_types.hxx>
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 95f2391aa30c..2c2dadcd5784 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -22,8 +22,8 @@
  *  XML import of all variable related text fields plus database display field
  */
 
-#ifndef _XMLOFF_TXTVFLDI_HXX
-#define _XMLOFF_TXTVFLDI_HXX
+#ifndef INCLUDED_XMLOFF_INC_TXTVFLDI_HXX
+#define INCLUDED_XMLOFF_INC_TXTVFLDI_HXX
 
 #include "txtvfldi.hxx"
 #include "txtfldi.hxx"
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 52c426718bc9..77944533de2b 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XEXPTRANSFORM_HXX
-#define _XEXPTRANSFORM_HXX
+#ifndef INCLUDED_XMLOFF_INC_XEXPTRAN_HXX
+#define INCLUDED_XMLOFF_INC_XEXPTRAN_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
@@ -166,6 +166,6 @@ public:
     const com::sun::star::drawing::FlagSequenceSequence& GetFlagSequenceSequence() const { return maPoly.Flags; }
 };
 
-#endif  //  _XEXPTRANSFORM_HXX
+#endif // INCLUDED_XMLOFF_INC_XEXPTRAN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx
index 022ea808ed0b..66bc1689ca54 100644
--- a/xmloff/inc/xmltabi.hxx
+++ b/xmloff/inc/xmltabi.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLTABI_HXX
-#define _XMLOFF_XMLTABI_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLTABI_HXX
+#define INCLUDED_XMLOFF_INC_XMLTABI_HXX
 
 #include "XMLElementPropertyContext.hxx"
 
@@ -49,6 +49,6 @@ public:
 };
 
 
-#endif  //  _XMLOFF_XMLTABI_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLTABI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index 0a96bdece5e1..0bf3113d1549 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLVERSION_HXX
-#define _XMLOFF_XMLVERSION_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLVERSION_HXX
+#define INCLUDED_XMLOFF_INC_XMLVERSION_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/document/XDocumentRevisionListPersistence.hpp>
diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx
index 53e42c8ded35..81bd079d3cdf 100644
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MULTI_PROPERTY_SET_HANDLER_HXX
-#define _MULTI_PROPERTY_SET_HANDLER_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_MULTIPROPERTYSETHANDLER_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_MULTIPROPERTYSETHANDLER_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
index 4bec37c8360a..bcb7c9675dad 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SCH_XMLAUTOSTYLEPOOLP_HXX_
-#define _SCH_XMLAUTOSTYLEPOOLP_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLAUTOSTYLEPOOLP_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLAUTOSTYLEPOOLP_HXX
 
 #include <xmloff/xmlaustp.hxx>
 
@@ -42,6 +42,6 @@ public:
     virtual ~SchXMLAutoStylePoolP();
 };
 
-#endif  // _SCH_XMLAUTOSTYLEPOOLP_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLAUTOSTYLEPOOLP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx
index 984598397eed..e112a09dcdfd 100644
--- a/xmloff/source/chart/SchXMLAxisContext.hxx
+++ b/xmloff/source/chart/SchXMLAxisContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SCH_XMLAXISCONTEXT_HXX_
-#define _SCH_XMLAXISCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLAXISCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLAXISCONTEXT_HXX
 
 #include "SchXMLImport.hxx"
 #include "transporttypes.hxx"
@@ -70,6 +70,6 @@ private:
     void SetAxisTitle();
 };
 
-#endif  // _SCH_XMLAXISCONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLAXISCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
index 22492eb0e501..2c953cdfc172 100644
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_SCHXMLCALCULATIONSETTINGSCONTEXT_HXX
-#define _XMLOFF_SCHXMLCALCULATIONSETTINGSCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLCALCULATIONSETTINGSCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLCALCULATIONSETTINGSCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index d16f42a85983..57178f84cc23 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SCH_XMLCHARTCONTEXT_HXX_
-#define _SCH_XMLCHARTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLCHARTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLCHARTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Sequence.h>
@@ -154,6 +154,6 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
 
-#endif  // _SCH_XMLCHARTCONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLCHARTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLEnumConverter.hxx b/xmloff/source/chart/SchXMLEnumConverter.hxx
index ee531b5f4fed..b3a5e79c60c0 100644
--- a/xmloff/source/chart/SchXMLEnumConverter.hxx
+++ b/xmloff/source/chart/SchXMLEnumConverter.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XML_CHART_ENUM_CONVERTER_HXX_
-#define _XML_CHART_ENUM_CONVERTER_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLENUMCONVERTER_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLENUMCONVERTER_HXX
 
 #include <xmloff/EnumPropertyHdl.hxx>
 
@@ -28,6 +28,6 @@ public:
     static XMLEnumPropertyHdl& getLegendExpansionConverter();//returns a singleton
 };
 
-#endif  // _XML_CHART_ENUM_CONVERTER_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLENUMCONVERTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLLegendContext.hxx b/xmloff/source/chart/SchXMLLegendContext.hxx
index f2f8f383e5d6..4f9d904a7c33 100644
--- a/xmloff/source/chart/SchXMLLegendContext.hxx
+++ b/xmloff/source/chart/SchXMLLegendContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SCH_XMLLEGENDCONTEXT_HXX_
-#define _SCH_XMLLEGENDCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLLEGENDCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLLEGENDCONTEXT_HXX
 
 #include "SchXMLImport.hxx"
 
@@ -33,6 +33,6 @@ private:
     SchXMLImportHelper& mrImportHelper;
 };
 
-#endif  // _SCH_XMLLEGENDCONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLLEGENDCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx
index 8c2b922f60b4..5236b63f73e2 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.hxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SCH_XMLPARAGRAPHCONTEXT_HXX_
-#define _SCH_XMLPARAGRAPHCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPARAGRAPHCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPARAGRAPHCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "rtl/ustring.hxx"
@@ -51,6 +51,6 @@ public:
     virtual void Characters( const OUString& rChars );
 };
 
-#endif  // _SCH_XMLPARAGRAPHCONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPARAGRAPHCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 692c2443514f..8b4e04286e80 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SCH_XMLPLOTAREACONTEXT_HXX_
-#define _SCH_XMLPLOTAREACONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPLOTAREACONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPLOTAREACONTEXT_HXX
 
 #include "SchXMLImport.hxx"
 #include "SchXMLChartContext.hxx"
@@ -269,6 +269,6 @@ private:
     tSchXMLLSequencesPerIndex& mrLSequencesPerIndex;
 };
 
-#endif  // _SCH_XMLPLOTAREACONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPLOTAREACONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
index e355449cfce0..f10d9d1d50b6 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SCH_XMLREGRESSIONCURVEOBJECTCONTEXT_HXX_
-#define _SCH_XMLREGRESSIONCURVEOBJECTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLREGRESSIONCURVEOBJECTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLREGRESSIONCURVEOBJECTCONTEXT_HXX
 
 #include "SchXMLImport.hxx"
 
@@ -83,6 +83,6 @@ private:
     ::com::sun::star::awt::Size maChartSize;
 };
 
-#endif  // _SCH_XMLPLOTAREACONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLREGRESSIONCURVEOBJECTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx
index 7503bc1131b3..8dbd3f3a7ec3 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef XMLOFF_SCHXMLSERIES2CONTEXT_HXX
-#define XMLOFF_SCHXMLSERIES2CONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLSERIES2CONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLSERIES2CONTEXT_HXX
 
 #include "transporttypes.hxx"
 #include "SchXMLChartContext.hxx"
@@ -132,7 +132,7 @@ public:
     static void switchSeriesLinesOff( ::std::list< DataRowPointStyle >& rSeriesStyleList );
 };
 
-// XMLOFF_SCHXMLSERIES2CONTEXT_HXX
+// INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLSERIES2CONTEXT_HXX
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index 09d2fa7839b9..19993cb56838 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SCH_XMLTABLECONTEXT_HXX_
-#define _SCH_XMLTABLECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTABLECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTABLECONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "SchXMLImport.hxx"
@@ -189,6 +189,6 @@ public:
     virtual void EndElement();
 };
 
-#endif  // _SCH_XMLTABLECONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTABLECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx
index 27089c000040..db45bcb52d62 100644
--- a/xmloff/source/chart/SchXMLTextListContext.hxx
+++ b/xmloff/source/chart/SchXMLTextListContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SCH_XMLTEXTLISTCONTEXT_HXX_
-#define _SCH_XMLTEXTLISTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTEXTLISTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTEXTLISTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "rtl/ustring.hxx"
@@ -47,6 +47,6 @@ private:
     std::vector< OUString> m_aTextVector;
 };
 
-#endif  // _SCH_XMLTEXTLISTCONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTEXTLISTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx
index 4fd373c67231..9c18303666f7 100644
--- a/xmloff/source/chart/SchXMLTools.hxx
+++ b/xmloff/source/chart/SchXMLTools.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SCH_XML_TOOLS_HXX_
-#define SCH_XML_TOOLS_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTOOLS_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTOOLS_HXX
 
 #include <rtl/ustring.hxx>
 #include <xmloff/xmltoken.hxx>
@@ -134,6 +134,6 @@ namespace SchXMLTools
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xDestination );
 }
 
-#endif  // SCH_XML_TOOLS_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
index 95787da6627d..228213e92dd0 100644
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLAXISPOSITIONPROPERTYHDL_HXX_
-#define _XMLAXISPOSITIONPROPERTYHDL_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_XMLAXISPOSITIONPROPERTYHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_XMLAXISPOSITIONPROPERTYHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -34,6 +34,6 @@ private:
     bool m_bCrossingValue;
 };
 
-#endif  // _XMLAXISPOSITIONPROPERTYHDL_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLAXISPOSITIONPROPERTYHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx
index ab1f07938fb7..28a9657063bf 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.hxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_CHARTPROPERTYCONTEXT_HXX_
-#define _XMLOFF_CHARTPROPERTYCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_XMLCHARTPROPERTYCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_XMLCHARTPROPERTYCONTEXT_HXX
 
 #include <xmloff/xmlprcon.hxx>
 
@@ -47,6 +47,6 @@ public:
 private:
 };
 
-#endif  // _XMLOFF_CHARTPROPERTYCONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLCHARTPROPERTYCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
index 197bf9ac8e11..34f30362f670 100644
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLERRORBARSTYLEPROPERTYHDL_HXX_
-#define _XMLERRORBARSTYLEPROPERTYHDL_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORBARSTYLEPROPERTYHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORBARSTYLEPROPERTYHDL_HXX
 
 #include <xmloff/EnumPropertyHdl.hxx>
 
@@ -30,6 +30,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif  // _XMLERRORBARSTYLEPROPERTYHDL_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORBARSTYLEPROPERTYHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
index fb71f5d71b63..9e0a0d402216 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLERRORINDICATORPROPERTYHDL_HXX_
-#define _XMLERRORINDICATORPROPERTYHDL_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORINDICATORPROPERTYHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORINDICATORPROPERTYHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -35,6 +35,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif  // _XMLERRORINDICATORPROPERTYHDL_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORINDICATORPROPERTYHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
index e2baa0f80e15..0f5a24059f13 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef XMLOFF_LABELSEPARATORCONTEXT_HXX_
-#define XMLOFF_LABELSEPARATORCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_XMLLABELSEPARATORCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_XMLLABELSEPARATORCONTEXT_HXX
 
 #include "XMLElementPropertyContext.hxx"
 
@@ -43,6 +43,6 @@ private:
     OUString         m_aSeparator;
 };
 
-#endif  // _XMLOFF_SYMBOLIMAGECONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLLABELSEPARATORCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx
index 215f6a641352..5b47e64215cf 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.hxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_SYMBOLIMAGECONTEXT_HXX_
-#define _XMLOFF_SYMBOLIMAGECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLIMAGECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLIMAGECONTEXT_HXX
 
 #include "XMLElementPropertyContext.hxx"
 
@@ -48,6 +48,6 @@ private:
     ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream;
 };
 
-#endif  // _XMLOFF_SYMBOLIMAGECONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLIMAGECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
index 8fe5618b038b..6c6c088832e4 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLSYMBOLTYPEPROPERTYHDL_HXX_
-#define _XMLSYMBOLTYPEPROPERTYHDL_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLTYPEPROPERTYHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLTYPEPROPERTYHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -34,6 +34,6 @@ private:
     bool m_bIsNamedSymbol;
 };
 
-#endif  // _XMLSYMBOLTYPEPROPERTYHDL_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLTYPEPROPERTYHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx
index 1b21e8eb1dba..f727f0cf73df 100644
--- a/xmloff/source/chart/XMLTextOrientationHdl.hxx
+++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLTEXTORIENTATIONHDL_HXX_
-#define _XMLTEXTORIENTATIONHDL_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_XMLTEXTORIENTATIONHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_XMLTEXTORIENTATIONHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -35,6 +35,6 @@ public:
                                 const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif  // _XMLTEXTORIENTATIONHDL_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLTEXTORIENTATIONHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx
index b728b4526808..8c090464fe01 100644
--- a/xmloff/source/chart/contexts.hxx
+++ b/xmloff/source/chart/contexts.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SCH_XML_CONTEXTS_HXX_
-#define _SCH_XML_CONTEXTS_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_CONTEXTS_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_CONTEXTS_HXX
 
 #include "SchXMLImport.hxx"
 #include "SchXMLTableContext.hxx"
@@ -95,6 +95,6 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
 
-#endif  // _SCH_XML_CONTEXTS_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_CONTEXTS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx
index 0060154a47ae..7b125395c420 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SCH_XML_TRANSPORTTYPES_HXX_
-#define SCH_XML_TRANSPORTTYPES_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CHART_TRANSPORTTYPES_HXX
+#define INCLUDED_XMLOFF_SOURCE_CHART_TRANSPORTTYPES_HXX
 
 #include <com/sun/star/chart2/XDataSeries.hpp>
 #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
@@ -213,6 +213,6 @@ struct DataRowPointStyle
 typedef ::std::multimap< OUString, ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::data::XDataSequence > > tSchXMLRangeSequenceMap;
 
-#endif  // SCH_XML_TRANSPORTTYPES_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_CHART_TRANSPORTTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/SvXMLAttr.hxx b/xmloff/source/core/SvXMLAttr.hxx
index 0a60075e5088..4b5e6d1cbe39 100644
--- a/xmloff/source/core/SvXMLAttr.hxx
+++ b/xmloff/source/core/SvXMLAttr.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _XMLOFF_SVXMLATTR_HXX
-#define _XMLOFF_SVXMLATTR_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_CORE_SVXMLATTR_HXX
+#define INCLUDED_XMLOFF_SOURCE_CORE_SVXMLATTR_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -32,6 +32,6 @@ public:
     const OUString& getValue() const;
 };
 
-#endif /* _XMLOFF_SVXMLATTR_HXX */
+#endif // INCLUDED_XMLOFF_SOURCE_CORE_SVXMLATTR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/SvXMLAttrCollection.hxx b/xmloff/source/core/SvXMLAttrCollection.hxx
index f9627c950e2f..5e4bcb171401 100644
--- a/xmloff/source/core/SvXMLAttrCollection.hxx
+++ b/xmloff/source/core/SvXMLAttrCollection.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SVXMLATTRCOLLECTION_HXX_
-#define SVXMLATTRCOLLECTION_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CORE_SVXMLATTRCOLLECTION_HXX
+#define INCLUDED_XMLOFF_SOURCE_CORE_SVXMLATTRCOLLECTION_HXX
 
 #include "SvXMLAttr.hxx"
 
@@ -63,7 +63,7 @@ private:
     sal_uInt16 GetPrefixPos( size_t i ) const;
 };
 
-#endif /* SVXMLATTRCOLLECTION_HXX_ */
+#endif // INCLUDED_XMLOFF_SOURCE_CORE_SVXMLATTRCOLLECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 
diff --git a/xmloff/source/core/xmlenums.hxx b/xmloff/source/core/xmlenums.hxx
index 68b02e067431..18b0f9a4a31b 100644
--- a/xmloff/source/core/xmlenums.hxx
+++ b/xmloff/source/core/xmlenums.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLENUMS_HXX_
-#define _XMLENUMS_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_CORE_XMLENUMS_HXX
+#define INCLUDED_XMLOFF_SOURCE_CORE_XMLENUMS_HXX
 
 enum XMLForbiddenCharactersEnum
 {
diff --git a/xmloff/source/draw/XMLNumberStylesExport.hxx b/xmloff/source/draw/XMLNumberStylesExport.hxx
index e087873b14e4..ecaf1d1e8773 100644
--- a/xmloff/source/draw/XMLNumberStylesExport.hxx
+++ b/xmloff/source/draw/XMLNumberStylesExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_NUMBERSTYLESEXPORT_HXX
-#define _XMLOFF_NUMBERSTYLESEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XMLNUMBERSTYLESEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XMLNUMBERSTYLESEXPORT_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -41,6 +41,6 @@ public:
     static OUString getDateStyleName(const sal_Int32 nDateFormat );
 };
 
-#endif  //  _XMLOFF_NUMBERSTYLESEXPORT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XMLNUMBERSTYLESEXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx
index 0284116d1514..15e1b56cb557 100644
--- a/xmloff/source/draw/descriptionimp.hxx
+++ b/xmloff/source/draw/descriptionimp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_DESCRIPTIONIMP_HXX
-#define _XMLOFF_DESCRIPTIONIMP_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_DESCRIPTIONIMP_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_DESCRIPTIONIMP_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -47,6 +47,6 @@ public:
     virtual void Characters( const OUString& rChars );
 };
 
-#endif  //  _XMLOFF_EVENTIMP_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_DESCRIPTIONIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx
index 59828d9ba4ea..55b45c7949e1 100644
--- a/xmloff/source/draw/eventimp.hxx
+++ b/xmloff/source/draw/eventimp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_EVENTIMP_HXX
-#define _XMLOFF_EVENTIMP_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_EVENTIMP_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_EVENTIMP_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -44,6 +44,6 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
-#endif  //  _XMLOFF_EVENTIMP_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_EVENTIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/layerexp.hxx b/xmloff/source/draw/layerexp.hxx
index d5577a6268bb..2c2ea0efe721 100644
--- a/xmloff/source/draw/layerexp.hxx
+++ b/xmloff/source/draw/layerexp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_LAYEREXP_HXX
-#define _XMLOFF_LAYEREXP_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_LAYEREXP_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_LAYEREXP_HXX
 
 class SvXMLExport;
 
@@ -28,6 +28,6 @@ public:
     static void exportLayer( SvXMLExport& rExport );
 };
 
-#endif  //  _XMLOFF_ANIMEXP_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_LAYEREXP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx
index 70d691d26fef..2d139a4bfc0c 100644
--- a/xmloff/source/draw/numithdl.hxx
+++ b/xmloff/source/draw/numithdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_NUMRULE_HXX
-#define _XMLOFF_PROPERTYHANDLER_NUMRULE_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_NUMITHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_NUMITHDL_HXX
 
 #include <com/sun/star/ucb/XAnyCompare.hpp>
 #include <xmloff/xmlprhdl.hxx>
@@ -41,6 +41,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_NUMRULE_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_NUMITHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx
index 1c1a144a4be7..5ac3ae458dce 100644
--- a/xmloff/source/draw/propimp0.hxx
+++ b/xmloff/source/draw/propimp0.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PROPIMP0_HXX
-#define _PROPIMP0_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_PROPIMP0_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_PROPIMP0_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -65,6 +65,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif  //  _PROPIMP0_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_PROPIMP0_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index 413694a873eb..00b8f63770c0 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDPROPLS_HXX
-#define _SDPROPLS_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_SDPROPLS_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_SDPROPLS_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <xmloff/xmlnume.hxx>
@@ -294,6 +294,6 @@ public:
                             ) const;
 };
 
-#endif  //  _SDPROPLS_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_SDPROPLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index fd17b4d8b174..8a5c4fbb8ff8 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDXMLEXP_IMPL_HXX
-#define _SDXMLEXP_IMPL_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_SDXMLEXP_IMPL_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_SDXMLEXP_IMPL_HXX
 
 #include <xmloff/xmlexp.hxx>
 
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 390cd5e54058..aff29f37fb3b 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDXMLIMP_IMPL_HXX
-#define _SDXMLIMP_IMPL_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_SDXMLIMP_IMPL_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_SDXMLIMP_IMPL_HXX
 
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index bfdb75788c56..3ebd8d706626 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XIMP3DOBJECT_HXX
-#define _XIMP3DOBJECT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DOBJECT_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DOBJECT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
@@ -158,6 +158,6 @@ public:
     virtual void EndElement();
 };
 
-#endif  //  _XIMP3DOBJECT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DOBJECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index 5d8dc655b7f7..3ac8354157fe 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XIMP3DSCENE_HXX
-#define _XIMP3DSCENE_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DSCENE_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DSCENE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
@@ -67,6 +67,6 @@ public:
         { return mxShapes; }
 };
 
-#endif  //  _XIMPGROUP_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DSCENE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index f45acb9c4809..b803ce3a3cb3 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XIMPBODY_HXX
-#define _XIMPBODY_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPBODY_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPBODY_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
@@ -65,6 +65,6 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
-#endif  //  _XIMPBODY_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPBODY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx
index 008ba4a08da7..26b6c143053c 100644
--- a/xmloff/source/draw/ximpcustomshape.hxx
+++ b/xmloff/source/draw/ximpcustomshape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XIMPCUSTOMSHAPE_HXX_
-#define _XMLOFF_XIMPCUSTOMSHAPE_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPCUSTOMSHAPE_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPCUSTOMSHAPE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx
index 431ad4ed80e2..2df42a2b072c 100644
--- a/xmloff/source/draw/ximpgrp.hxx
+++ b/xmloff/source/draw/ximpgrp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XIMPGROUP_HXX
-#define _XIMPGROUP_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPGRP_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPGRP_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
@@ -59,6 +59,6 @@ public:
         { return mxShapes; }
 };
 
-#endif  //  _XIMPGROUP_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPGRP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx
index e02b0257b11a..015ae148db19 100644
--- a/xmloff/source/draw/ximplink.hxx
+++ b/xmloff/source/draw/ximplink.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XIMPLINK_HXX
-#define _XIMPLINK_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPLINK_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPLINK_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
@@ -53,6 +53,6 @@ public:
     virtual void EndElement();
 };
 
-#endif  //  _XIMPLINK_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPLINK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx
index 9927b4e98ad6..5a9f48f908dd 100644
--- a/xmloff/source/draw/ximpnote.hxx
+++ b/xmloff/source/draw/ximpnote.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XIMPNOTES_HXX
-#define _XIMPNOTES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPNOTE_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPNOTE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
@@ -45,6 +45,6 @@ public:
     virtual void EndElement();
 };
 
-#endif  //  _XIMPNOTES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPNOTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index dc4338f1c819..c93768d878bb 100644
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XIMPPAGE_HXX
-#define _XIMPPAGE_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPPAGE_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPPAGE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
@@ -83,6 +83,6 @@ public:
         { return mxShapes; }
 };
 
-#endif  //  _XIMPGROUP_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 34786ec072a0..cde690499e14 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XIMPSHAPE_HXX
-#define _XIMPSHAPE_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHAP_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHAP_HXX
 
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/document/XActionLockable.hpp>
@@ -640,6 +640,6 @@ private:
     sal_Bool maTemplateStylesUsed[6];
 };
 
-#endif  //  _XIMPSHAPE_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx
index 50fcb9fd197e..ffff1c9dc87c 100644
--- a/xmloff/source/draw/ximpshow.hxx
+++ b/xmloff/source/draw/ximpshow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XIMPSHOW_HXX
-#define _XMLOFF_XIMPSHOW_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHOW_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHOW_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
@@ -44,6 +44,6 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
-#endif  //  _XMLOFF_XIMPSHOW_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index e53ec1cec418..a8f96c430d50 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XIMPSTYLE_HXX
-#define _XIMPSTYLE_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSTYL_HXX
+#define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSTYL_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
@@ -283,6 +283,6 @@ private:
     sal_Bool        mbFixed;
 };
 
-#endif  //  _XIMPSTYLE_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSTYL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
index 344bbc6b22ec..6628d9b9f835 100644
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_ATTRIBLISTMERGE_HXX_
-#define _XMLOFF_FORMS_ATTRIBLISTMERGE_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX
 
 #include <comphelper/stl_types.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -66,6 +66,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_ATTRIBLISTMERGE_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx
index 9cc6d0498fca..21b9224bed16 100644
--- a/xmloff/source/forms/callbacks.hxx
+++ b/xmloff/source/forms/callbacks.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_CALLBACKS_HXX_
-#define _XMLOFF_FORMS_CALLBACKS_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_CALLBACKS_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_CALLBACKS_HXX
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -78,6 +78,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_CALLBACKS_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_CALLBACKS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/controlelement.hxx b/xmloff/source/forms/controlelement.hxx
index acc11534fe9f..2063e3c776ae 100644
--- a/xmloff/source/forms/controlelement.hxx
+++ b/xmloff/source/forms/controlelement.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_CONTROLELEMENT_HXX_
-#define _XMLOFF_FORMS_CONTROLELEMENT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_CONTROLELEMENT_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_CONTROLELEMENT_HXX
 
 #include <sal/types.h>
 
@@ -77,6 +77,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_CONTROLELEMENT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_CONTROLELEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx
index 7a58d771db5f..e3e916c44b2d 100644
--- a/xmloff/source/forms/controlpropertymap.hxx
+++ b/xmloff/source/forms/controlpropertymap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_CONTROLPROPERTYMAP_HXX_
-#define _XMLOFF_FORMS_CONTROLPROPERTYMAP_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_CONTROLPROPERTYMAP_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_CONTROLPROPERTYMAP_HXX
 
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlexppr.hxx>
@@ -49,6 +49,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_CONTROLPROPERTYMAP_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_CONTROLPROPERTYMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index 38c3beccbb7f..6b89f9d30430 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ELEMENTEXPORT_HXX_
-#define _XMLOFF_ELEMENTEXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTEXPORT_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -305,6 +305,6 @@ namespace xmloff
     };
 }   // namespace xmloff
 
-#endif // _XMLOFF_ELEMENTEXPORT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTEXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index e3df69e253c0..6e8ffbbaa377 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_ELEMENTIMPORT_HXX_
-#define _XMLOFF_FORMS_ELEMENTIMPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTIMPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTIMPORT_HXX
 
 #include "propertyimport.hxx"
 #include "controlelement.hxx"
@@ -713,6 +713,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_ELEMENTIMPORT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx
index 91548c49a119..7c40297c9d0e 100644
--- a/xmloff/source/forms/eventexport.hxx
+++ b/xmloff/source/forms/eventexport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_EVENTEXPORT_HXX_
-#define _XMLOFF_FORMS_EVENTEXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_EVENTEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_EVENTEXPORT_HXX
 
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
@@ -67,6 +67,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_EVENTEXPORT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_EVENTEXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx
index 1993828255f5..a7a56cb8a112 100644
--- a/xmloff/source/forms/eventimport.hxx
+++ b/xmloff/source/forms/eventimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_EVENTIMPORT_HXX_
-#define _XMLOFF_FORMS_EVENTIMPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_EVENTIMPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_EVENTIMPORT_HXX
 
 #include <xmloff/XMLEventsImportContext.hxx>
 #include "callbacks.hxx"
@@ -75,6 +75,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_EVENTIMPORT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_EVENTIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index 9b933c42205f..3136eb9faefa 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMATTRIBUTES_HXX_
-#define _XMLOFF_FORMATTRIBUTES_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_FORMATTRIBUTES_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_FORMATTRIBUTES_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <sal/types.h>
@@ -343,6 +343,6 @@ namespace xmloff
     };
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMATTRIBUTES_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_FORMATTRIBUTES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formenums.hxx b/xmloff/source/forms/formenums.hxx
index 58786fa486ee..744db248e12d 100644
--- a/xmloff/source/forms/formenums.hxx
+++ b/xmloff/source/forms/formenums.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMENUMS_HXX_
-#define _XMLOFF_FORMENUMS_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_FORMENUMS_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_FORMENUMS_HXX
 
 #include <xmloff/xmlement.hxx>
 
@@ -62,6 +62,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMENUMS_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_FORMENUMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formevents.hxx b/xmloff/source/forms/formevents.hxx
index df222d38660a..131ec338c870 100644
--- a/xmloff/source/forms/formevents.hxx
+++ b/xmloff/source/forms/formevents.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_FORMEVENTS_HXX_
-#define _XMLOFF_FORMS_FORMEVENTS_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_FORMEVENTS_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_FORMEVENTS_HXX
 
 struct XMLEventNameTranslation;
 namespace xmloff
@@ -29,6 +29,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_FORMEVENTS_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_FORMEVENTS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx
index 422630e8e569..585bd9ee2b17 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.hxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX
-#define XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX
 
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -64,6 +64,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/handler/property_handler_base.hxx b/xmloff/source/forms/handler/property_handler_base.hxx
index 72789f90b866..f41692a13249 100644
--- a/xmloff/source/forms/handler/property_handler_base.hxx
+++ b/xmloff/source/forms/handler/property_handler_base.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_PROPERTY_HANDLER_BASE_HXX
-#define XMLOFF_PROPERTY_HANDLER_BASE_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_PROPERTY_HANDLER_BASE_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_PROPERTY_HANDLER_BASE_HXX
 
 #include "forms/property_handler.hxx"
 
@@ -48,6 +48,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_PROPERTY_HANDLER_BASE_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_PROPERTY_HANDLER_BASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx
index 5c0e3d123f57..a2736e11cd7d 100644
--- a/xmloff/source/forms/handler/vcl_date_handler.hxx
+++ b/xmloff/source/forms/handler/vcl_date_handler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_VCL_DATE_HANDLER_HXX
-#define XMLOFF_VCL_DATE_HANDLER_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_VCL_DATE_HANDLER_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_VCL_DATE_HANDLER_HXX
 
 #include "property_handler_base.hxx"
 
@@ -39,6 +39,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_VCL_DATE_HANDLER_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_VCL_DATE_HANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx
index 895650f96b57..564714e8ff38 100644
--- a/xmloff/source/forms/handler/vcl_time_handler.hxx
+++ b/xmloff/source/forms/handler/vcl_time_handler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_VCL_TIME_HANDLER_HXX
-#define XMLOFF_VCL_TIME_HANDLER_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_VCL_TIME_HANDLER_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_VCL_TIME_HANDLER_HXX
 
 #include "property_handler_base.hxx"
 
@@ -39,6 +39,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_VCL_TIME_HANDLER_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_HANDLER_VCL_TIME_HANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx
index b4859d88bf02..455c6219ec1c 100644
--- a/xmloff/source/forms/ifacecompare.hxx
+++ b/xmloff/source/forms/ifacecompare.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_IFACECOMPARE_HXX_
-#define _XMLOFF_FORMS_IFACECOMPARE_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_IFACECOMPARE_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_IFACECOMPARE_HXX
 
 #include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -52,6 +52,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_IFACECOMPARE_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_IFACECOMPARE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index a0e0a033e5b0..62d41115d7c3 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_LAYEREXPORT_HXX_
-#define _XMLOFF_FORMS_LAYEREXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_LAYEREXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_LAYEREXPORT_HXX
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
@@ -298,6 +298,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_LAYEREXPORT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_LAYEREXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index 9431525ca480..b2341b340d2b 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_LAYERIMPORT_HXX_
-#define _XMLOFF_FORMS_LAYERIMPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_LAYERIMPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_LAYERIMPORT_HXX
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/form/XFormsSupplier2.hpp>
@@ -173,6 +173,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_LAYERIMPORT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_LAYERIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/logging.hxx b/xmloff/source/forms/logging.hxx
index bb292da83d20..03007adc7141 100644
--- a/xmloff/source/forms/logging.hxx
+++ b/xmloff/source/forms/logging.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_FORMS_LOGGING_HXX
-#define XMLOFF_FORMS_LOGGING_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_LOGGING_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_LOGGING_HXX
 
 #include <sal/types.h>
 #include <stack>
@@ -57,6 +57,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // XMLOFF_FORMS_LOGGING_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_LOGGING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx
index 9e4f3d304a8b..e1874022d391 100644
--- a/xmloff/source/forms/officeforms.hxx
+++ b/xmloff/source/forms/officeforms.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_OFFICEFORMS_HXX_
-#define _XMLOFF_FORMS_OFFICEFORMS_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_OFFICEFORMS_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_OFFICEFORMS_HXX
 
 #include "formattributes.hxx"
 #include <xmloff/xmlictxt.hxx>
@@ -83,6 +83,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_OFFICEFORMS_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_OFFICEFORMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx
index ee1c25b2ca01..1a6ad2300c96 100644
--- a/xmloff/source/forms/property_description.hxx
+++ b/xmloff/source/forms/property_description.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_PROPERTY_DESCRIPTION_HXX
-#define XMLOFF_PROPERTY_DESCRIPTION_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTY_DESCRIPTION_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTY_DESCRIPTION_HXX
 
 #include "forms/property_handler.hxx"
 #include "property_group.hxx"
@@ -117,6 +117,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_PROPERTY_DESCRIPTION_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTY_DESCRIPTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/property_group.hxx b/xmloff/source/forms/property_group.hxx
index 16e27063254f..c763d09f42e7 100644
--- a/xmloff/source/forms/property_group.hxx
+++ b/xmloff/source/forms/property_group.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_PROPERTY_GROUP_HXX
-#define XMLOFF_PROPERTY_GROUP_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTY_GROUP_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTY_GROUP_HXX
 
 namespace xmloff
 {
@@ -31,6 +31,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_PROPERTY_GROUP_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTY_GROUP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/property_meta_data.hxx b/xmloff/source/forms/property_meta_data.hxx
index 2216f50a6fb5..8d10cad16ac2 100644
--- a/xmloff/source/forms/property_meta_data.hxx
+++ b/xmloff/source/forms/property_meta_data.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_PROPERTY_META_DATA_HXX
-#define XMLOFF_PROPERTY_META_DATA_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTY_META_DATA_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTY_META_DATA_HXX
 
 #include "property_description.hxx"
 
@@ -51,6 +51,6 @@ namespace xmloff { namespace metadata
 
 } } // namespace xmloff::metadata
 
-#endif // XMLOFF_PROPERTY_META_DATA_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTY_META_DATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index 69f06c3a6c81..ea950b573b1e 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_PROPERTYEXPORT_HXX_
-#define _XMLOFF_FORMS_PROPERTYEXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYEXPORT_HXX
 
 #include "formattributes.hxx"
 #include <comphelper/stl_types.hxx>
@@ -404,6 +404,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_PROPERTYEXPORT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYEXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index 7703979c1881..83d70e3fc25e 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_PROPERTYIMPORT_HXX_
-#define _XMLOFF_FORMS_PROPERTYIMPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYIMPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYIMPORT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "formattributes.hxx"
@@ -224,6 +224,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_PROPERTYIMPORT_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/strings.hxx b/xmloff/source/forms/strings.hxx
index 51c56211fbf1..cb1b7564c299 100644
--- a/xmloff/source/forms/strings.hxx
+++ b/xmloff/source/forms/strings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_STRINGS_HXX_
-#define _XMLOFF_FORMS_STRINGS_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_STRINGS_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_STRINGS_HXX
 
 namespace xmloff
 {
@@ -205,6 +205,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_STRINGS_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_STRINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/valueproperties.hxx b/xmloff/source/forms/valueproperties.hxx
index 495a3b362c4a..37cef5fd6042 100644
--- a/xmloff/source/forms/valueproperties.hxx
+++ b/xmloff/source/forms/valueproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMS_VALUEPROPERTIES_HXX_
-#define _XMLOFF_FORMS_VALUEPROPERTIES_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_VALUEPROPERTIES_HXX
+#define INCLUDED_XMLOFF_SOURCE_FORMS_VALUEPROPERTIES_HXX
 
 #include "controlelement.hxx"
 
@@ -65,6 +65,6 @@ namespace xmloff
 
 }   // namespace xmloff
 
-#endif // _XMLOFF_FORMS_VALUEPROPERTIES_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_FORMS_VALUEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx
index 0486fd7e9ce5..9f1bb0243ab2 100644
--- a/xmloff/source/script/xmlbasici.hxx
+++ b/xmloff/source/script/xmlbasici.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLBASICI_HXX
-#define _XMLOFF_XMLBASICI_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_SCRIPT_XMLBASICI_HXX
+#define INCLUDED_XMLOFF_SOURCE_SCRIPT_XMLBASICI_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/document/XXMLOasisBasicImporter.hpp>
@@ -71,6 +71,6 @@ public:
     virtual void Characters( const OUString& rChars );
 };
 
-#endif // _XMLOFF_XMLBASICI_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_SCRIPT_XMLBASICI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/DrawAspectHdl.hxx b/xmloff/source/style/DrawAspectHdl.hxx
index e73242a0855f..4082bfb0c546 100644
--- a/xmloff/source/style/DrawAspectHdl.hxx
+++ b/xmloff/source/style/DrawAspectHdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_DRAWASPECTHDL_HXX
-#define _XMLOFF_DRAWASPECTHDL_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_DRAWASPECTHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_DRAWASPECTHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -34,6 +34,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_DRAWASPECTHDL_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_DRAWASPECTHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx
index 336e55626d20..a009078ec989 100644
--- a/xmloff/source/style/FillStyleContext.hxx
+++ b/xmloff/source/style/FillStyleContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FILLSTYLECONTEXTS_HXX_
-#define _XMLOFF_FILLSTYLECONTEXTS_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_FILLSTYLECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_FILLSTYLECONTEXT_HXX
 
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <xmloff/xmlstyle.hxx>
@@ -150,6 +150,6 @@ public:
     virtual sal_Bool IsTransient() const;
 };
 
-#endif  // _XMLOFF_FILLSTYLECONTEXTS_HXX_
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_FILLSTYLECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx
index 21710ee69f4a..bf245e24eae8 100644
--- a/xmloff/source/style/PageHeaderFooterContext.hxx
+++ b/xmloff/source/style/PageHeaderFooterContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_PAGEHEADERFOOTERCONTEXT_HXX
-#define _XMLOFF_PAGEHEADERFOOTERCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_PAGEHEADERFOOTERCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_PAGEHEADERFOOTERCONTEXT_HXX
 
 #include <xmloff/xmlimp.hxx>
 
diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx
index 7e3c022c4d66..d9c19aa6dbda 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PAGEMASTEREXPORTPROPMAPPER_HXX
-#define _XMLOFF_PAGEMASTEREXPORTPROPMAPPER_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_PAGEMASTEREXPORTPROPMAPPER_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_PAGEMASTEREXPORTPROPMAPPER_HXX
 
 #include <xmloff/xmlexppr.hxx>
 #include "XMLBackgroundImageExport.hxx"
diff --git a/xmloff/source/style/PageMasterImportPropMapper.hxx b/xmloff/source/style/PageMasterImportPropMapper.hxx
index effb6c61a129..bec8d7e76cb8 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PAGEMASTERIMPORTPROPMAPPER_HXX
-#define _XMLOFF_PAGEMASTERIMPORTPROPMAPPER_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_PAGEMASTERIMPORTPROPMAPPER_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_PAGEMASTERIMPORTPROPMAPPER_HXX
 
 #include <xmloff/xmlimppr.hxx>
 
diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx
index f12389cfce82..b9ba281bbcb2 100644
--- a/xmloff/source/style/PageMasterPropHdl.hxx
+++ b/xmloff/source/style/PageMasterPropHdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PAGEMASTERPROPHDL_HXX_
-#define _XMLOFF_PAGEMASTERPROPHDL_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_PAGEMASTERPROPHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_PAGEMASTERPROPHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.hxx b/xmloff/source/style/PageMasterPropHdlFactory.hxx
index 8da183618b7e..80e7b6e73df6 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.hxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PAGEMASTERPROPHDLFACTORY_HXX
-#define _XMLOFF_PAGEMASTERPROPHDLFACTORY_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_PAGEMASTERPROPHDLFACTORY_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_PAGEMASTERPROPHDLFACTORY_HXX
 
 #include <xmloff/prhdlfac.hxx>
 
diff --git a/xmloff/source/style/PageMasterPropMapper.hxx b/xmloff/source/style/PageMasterPropMapper.hxx
index db2f237d382f..0ee9f7793a32 100644
--- a/xmloff/source/style/PageMasterPropMapper.hxx
+++ b/xmloff/source/style/PageMasterPropMapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PAGEMASTERPROPMAPPER_HXX_
-#define _XMLOFF_PAGEMASTERPROPMAPPER_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_PAGEMASTERPROPMAPPER_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_PAGEMASTERPROPMAPPER_HXX
 
 #include <xmloff/xmlprmap.hxx>
 
diff --git a/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx
index 45c68b46b208..2d7f3d2ee7f1 100644
--- a/xmloff/source/style/PagePropertySetContext.hxx
+++ b/xmloff/source/style/PagePropertySetContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PAGEPROPERTYSETCONTEXT_HXX
-#define _XMLOFF_PAGEPROPERTYSETCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_PAGEPROPERTYSETCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_PAGEPROPERTYSETCONTEXT_HXX
 
 #include <xmloff/xmlprcon.hxx>
 
@@ -54,7 +54,6 @@ public:
                                    const XMLPropertyState& rProp);
 };
 
-
-#endif  //  _XMLOFF_XMLTEXTPROPERTYSETCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_PAGEPROPERTYSETCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx
index 6a794b9668bc..81e1b7afdaa2 100644
--- a/xmloff/source/style/XMLFontStylesContext_impl.hxx
+++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLFONTSTYLESCONTEXT_IMPL_HXX_
-#define _XMLOFF_XMLFONTSTYLESCONTEXT_IMPL_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_XMLFONTSTYLESCONTEXT_IMPL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_XMLFONTSTYLESCONTEXT_IMPL_HXX
 
 #include <xmloff/xmlstyle.hxx>
 
diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
index 9b3ef89712d0..6b53c5974757 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLFOOTNOTESEPARATOREXPORT_HXX
-#define _XMLOFF_XMLFOOTNOTESEPARATOREXPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_XMLFOOTNOTESEPARATOREXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_XMLFOOTNOTESEPARATOREXPORT_HXX
 
 #include <sal/types.h>
 
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
index eb8b38836cae..03d6cce38e7e 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLFOOTNOTESEPARATORIMPORT_HXX
-#define _XMLOFF_XMLFOOTNOTESEPARATORIMPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_XMLFOOTNOTESEPARATORIMPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_XMLFOOTNOTESEPARATORIMPORT_HXX
 
 
 
diff --git a/xmloff/source/style/adjushdl.hxx b/xmloff/source/style/adjushdl.hxx
index 00d53d91c8cf..cb2623ccb1e8 100644
--- a/xmloff/source/style/adjushdl.hxx
+++ b/xmloff/source/style/adjushdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_ADJUSTTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_ADJUSTTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_ADJUSHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_ADJUSHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -46,6 +46,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_ADJUSTTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_ADJUSHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/backhdl.hxx b/xmloff/source/style/backhdl.hxx
index 29343ce143e9..10d4e0fb3de7 100644
--- a/xmloff/source/style/backhdl.hxx
+++ b/xmloff/source/style/backhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_BRUSHTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_BRUSHTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_BACKHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_BACKHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 #include <com/sun/star/style/GraphicLocation.hpp>
@@ -41,6 +41,6 @@ private:
     void MergeXMLVertPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eVert ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_BRUSHTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_BACKHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/bordrhdl.hxx b/xmloff/source/style/bordrhdl.hxx
index 6485ba2f25f9..f3a2ac42f30d 100644
--- a/xmloff/source/style/bordrhdl.hxx
+++ b/xmloff/source/style/bordrhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_BORDERTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_BORDERTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_BORDRHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_BORDRHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -43,6 +43,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_CHARLOCALETYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_BORDRHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/breakhdl.hxx b/xmloff/source/style/breakhdl.hxx
index 2faf4c84c1a6..1986d92f151b 100644
--- a/xmloff/source/style/breakhdl.hxx
+++ b/xmloff/source/style/breakhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_BREAKTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_BREAKTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_BREAKHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_BREAKHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -46,6 +46,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_BREAKTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_BREAKHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/cdouthdl.hxx b/xmloff/source/style/cdouthdl.hxx
index d738df67dae6..c80fb99b3608 100644
--- a/xmloff/source/style/cdouthdl.hxx
+++ b/xmloff/source/style/cdouthdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_CROSSEDOUTTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_CROSSEDOUTTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_CDOUTHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_CDOUTHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -61,6 +61,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_CROSSEDOUTTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_CDOUTHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/chrhghdl.hxx b/xmloff/source/style/chrhghdl.hxx
index 7703b6fe681a..7016755b8dcf 100644
--- a/xmloff/source/style/chrhghdl.hxx
+++ b/xmloff/source/style/chrhghdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_CHARHEIGHTTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_CHARHEIGHTTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_CHRHGHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_CHRHGHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -52,6 +52,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_CHARHEIGHTTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_CHRHGHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/chrlohdl.hxx b/xmloff/source/style/chrlohdl.hxx
index 49a8d1f63e52..fbae00fe72c5 100644
--- a/xmloff/source/style/chrlohdl.hxx
+++ b/xmloff/source/style/chrlohdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_CHARLOCALETYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_CHARLOCALETYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_CHRLOHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_CHRLOHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -69,6 +69,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_CHARLOCALETYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_CHRLOHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/csmaphdl.hxx b/xmloff/source/style/csmaphdl.hxx
index 3258ff7ca03c..b35a1545e91a 100644
--- a/xmloff/source/style/csmaphdl.hxx
+++ b/xmloff/source/style/csmaphdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_CASEMAPTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_CASEMAPTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_CSMAPHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_CSMAPHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -43,6 +43,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_CASEMAPTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_CSMAPHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/durationhdl.hxx b/xmloff/source/style/durationhdl.hxx
index 8888674a21fb..d2e095c75382 100644
--- a/xmloff/source/style/durationhdl.hxx
+++ b/xmloff/source/style/durationhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_DURATIONS_HXX
-#define _XMLOFF_PROPERTYHANDLER_DURATIONS_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_DURATIONHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_DURATIONHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
diff --git a/xmloff/source/style/escphdl.hxx b/xmloff/source/style/escphdl.hxx
index 901166f04496..35a2a3b6094c 100644
--- a/xmloff/source/style/escphdl.hxx
+++ b/xmloff/source/style/escphdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_ESCAPETYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_ESCAPETYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_ESCPHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_ESCPHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -43,6 +43,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_ESCAPETYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_ESCPHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/fonthdl.hxx b/xmloff/source/style/fonthdl.hxx
index d1bb67f0ae3e..7a1a79b01800 100644
--- a/xmloff/source/style/fonthdl.hxx
+++ b/xmloff/source/style/fonthdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX
-#define XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_FONTHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_FONTHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -71,6 +71,6 @@ public:
 };
 
 
-#endif // XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_FONTHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 409ac0cdb6a5..42933721c64f 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLASTPL_IMPL_HXX
-#define _XMLOFF_XMLASTPL_IMPL_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_IMPASTPL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_IMPASTPL_HXX
 
 #include <boost/ptr_container/ptr_set.hpp>
 #include <sal/types.h>
diff --git a/xmloff/source/style/kernihdl.hxx b/xmloff/source/style/kernihdl.hxx
index e640dedc71aa..c158cfc1dd53 100644
--- a/xmloff/source/style/kernihdl.hxx
+++ b/xmloff/source/style/kernihdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_KERNINGTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_KERNINGTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_KERNIHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_KERNIHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -34,6 +34,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_KERNINGTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_KERNIHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/lspachdl.hxx b/xmloff/source/style/lspachdl.hxx
index bf522396c50b..4aef1086fb0b 100644
--- a/xmloff/source/style/lspachdl.hxx
+++ b/xmloff/source/style/lspachdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_LINESPACETYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_LINESPACETYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_LSPACHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_LSPACHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -52,6 +52,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_CHARHEIGHTTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_LSPACHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/opaquhdl.hxx b/xmloff/source/style/opaquhdl.hxx
index 0093e1f32c94..e748339320dc 100644
--- a/xmloff/source/style/opaquhdl.hxx
+++ b/xmloff/source/style/opaquhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_OPAQUETYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_OPAQUETYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_OPAQUHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_OPAQUHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -34,6 +34,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_OPAQUETYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_OPAQUHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/postuhdl.hxx b/xmloff/source/style/postuhdl.hxx
index 05e03761c116..bf2edeef2f8c 100644
--- a/xmloff/source/style/postuhdl.hxx
+++ b/xmloff/source/style/postuhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_POSTURETYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_POSTURETYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_POSTUHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_POSTUHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -34,6 +34,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_POSTURETYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_POSTUHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/shadwhdl.hxx b/xmloff/source/style/shadwhdl.hxx
index e9718b210834..8fec33751465 100644
--- a/xmloff/source/style/shadwhdl.hxx
+++ b/xmloff/source/style/shadwhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_SHADOWTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_SHADOWTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_SHADWHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_SHADWHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -34,6 +34,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_SHADWHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/shdwdhdl.hxx b/xmloff/source/style/shdwdhdl.hxx
index d056b64e54db..54eac28324d4 100644
--- a/xmloff/source/style/shdwdhdl.hxx
+++ b/xmloff/source/style/shdwdhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_SHADOWEDTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_SHADOWEDTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_SHDWDHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_SHDWDHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -34,6 +34,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_SHADOWEDTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_SHDWDHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/tabsthdl.hxx b/xmloff/source/style/tabsthdl.hxx
index f498c7c81757..cad325c4b8fe 100644
--- a/xmloff/source/style/tabsthdl.hxx
+++ b/xmloff/source/style/tabsthdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_TABSTOPTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_TABSTOPTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_TABSTHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_TABSTHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -37,6 +37,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_TABSTOPTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_TABSTHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/undlihdl.hxx b/xmloff/source/style/undlihdl.hxx
index 399376c936ae..00c143d97779 100644
--- a/xmloff/source/style/undlihdl.hxx
+++ b/xmloff/source/style/undlihdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_UNDERLINETYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_UNDERLINETYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_UNDLIHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_UNDLIHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -52,6 +52,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_UNDERLINETYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_UNDLIHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/weighhdl.hxx b/xmloff/source/style/weighhdl.hxx
index 3bea25bab9e5..6a419789bd0d 100644
--- a/xmloff/source/style/weighhdl.hxx
+++ b/xmloff/source/style/weighhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_FONTWEIGHTTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_FONTWEIGHTTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_WEIGHHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_WEIGHHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -35,6 +35,6 @@ public:
 };
 
 
-#endif      // _XMLOFF_PROPERTYHANDLER_FONTWEIGHTTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_WEIGHHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index e4526e6c00a1..58c6dc18691b 100644
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX
-#define _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_STYLE_XMLBAHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_STYLE_XMLBAHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -318,6 +318,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_STYLE_XMLBAHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/table/table.hxx b/xmloff/source/table/table.hxx
index 77ef971627ea..426b567ad30f 100644
--- a/xmloff/source/table/table.hxx
+++ b/xmloff/source/table/table.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TABLE_TABLE_HXX_
-#define _XMLOFF_TABLE_TABLE_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TABLE_TABLE_HXX
+#define INCLUDED_XMLOFF_SOURCE_TABLE_TABLE_HXX
 
 #include "xmloff/xmltoken.hxx"
 
diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx
index 6b3934e9db5d..b33882297f88 100644
--- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx
+++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLANCHORTYPEPROPHDL_HXX
-#define _XMLOFF_XMLANCHORTYPEPROPHDL_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLANCHORTYPEPROPHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLANCHORTYPEPROPHDL_HXX
 
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <xmloff/xmlprhdl.hxx>
@@ -41,6 +41,6 @@ public:
                  ::com::sun::star::text::TextContentAnchorType& rType );
 };
 
-#endif  //  _XMLOFF_XMLANCHORTYPEPROPHDL_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TEXT_XMLANCHORTYPEPROPHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx
index 3d8b57e90e42..33e3bc9b40a7 100644
--- a/xmloff/source/text/XMLAutoMarkFileContext.hxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLAUTOMARKFILECONTEXT_HXX_
-#define _XMLOFF_XMLAUTOMARKFILECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLAUTOMARKFILECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLAUTOMARKFILECONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
index e6920fd8a937..8b9440d63320 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLAUTOTEXTCONTAINEREVENTIMPORT_HXX
-#define _XMLOFF_XMLAUTOTEXTCONTAINEREVENTIMPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLAUTOTEXTCONTAINEREVENTIMPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLAUTOTEXTCONTAINEREVENTIMPORT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx
index fb870e0027a4..e30a00eec9a0 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLAUTOTEXTEVENTEXPORT_HXX
-#define _XMLOFF_XMLAUTOTEXTEVENTEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLAUTOTEXTEVENTEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLAUTOTEXTEVENTEXPORT_HXX
 
 #include <xmloff/xmlexp.hxx>
 
diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx
index 3bcdc87895ea..223c56d95425 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLAUTOTEXTEVENTIMPORT_HXX
-#define _XMLOFF_XMLAUTOTEXTEVENTIMPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLAUTOTEXTEVENTIMPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLAUTOTEXTEVENTIMPORT_HXX
 
 #include <xmloff/xmlimp.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/text/XMLCalculationSettingsContext.hxx b/xmloff/source/text/XMLCalculationSettingsContext.hxx
index 5851d08a6aaf..9fafb9c94abd 100644
--- a/xmloff/source/text/XMLCalculationSettingsContext.hxx
+++ b/xmloff/source/text/XMLCalculationSettingsContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLCALCULATIONSETTINGSCONTEXT_HXX
-#define _XMLOFF_XMLCALCULATIONSETTINGSCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLCALCULATIONSETTINGSCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLCALCULATIONSETTINGSCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx
index c9b230f39766..8bccea1f69ed 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.hxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _XMLOFF_XMLCHANGEELEMENTIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLCHANGEELEMENTIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLCHANGEELEMENTIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLCHANGEELEMENTIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx
index ab3c412d65b1..fff4eb276dae 100644
--- a/xmloff/source/text/XMLChangeImportContext.hxx
+++ b/xmloff/source/text/XMLChangeImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLCHANGEIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLCHANGEIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLCHANGEIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLCHANGEIMPORTCONTEXT_HXX
 
 
 #include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx
index 9a292b7377d0..a9902dc987a1 100644
--- a/xmloff/source/text/XMLChangeInfoContext.hxx
+++ b/xmloff/source/text/XMLChangeInfoContext.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _XMLOFF_XMLCHANGEINFOCONTEXT_HXX
-#define _XMLOFF_XMLCHANGEINFOCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLCHANGEINFOCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLCHANGEINFOCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx
index 51b1870c5787..a6c0883fc193 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.hxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _XMLOFF_XMLCHANGEDREGIONIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLCHANGEDREGIONIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLCHANGEDREGIONIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLCHANGEDREGIONIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
index 0e8298329f85..706a2079bd99 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLFOOTNOTEBODYIMPORTCONTEXT_HXX_
-#define _XMLOFF_XMLFOOTNOTEBODYIMPORTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLFOOTNOTEBODYIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLFOOTNOTEBODYIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx
index fc3eebb16006..dcc0269c1638 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLFOOTNOTEIMPORTCONTEXT_HXX_
-#define _XMLOFF_XMLFOOTNOTEIMPORTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLFOOTNOTEIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLFOOTNOTEIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
index 44a1a60fa82c..c39c464a440a 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXALPHABETICALSOURCECONTEXT_HXX_
-#define _XMLOFF_XMLINDEXALPHABETICALSOURCECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXALPHABETICALSOURCECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXALPHABETICALSOURCECONTEXT_HXX
 
 #include "XMLIndexSourceBaseContext.hxx"
 #include <xmloff/languagetagodf.hxx>
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
index f7f76eee176f..ba8e47dab8b9 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXBIBLIOGRAPHYENTRYCONTEXT_HXX_
-#define _XMLOFF_XMLINDEXBIBLIOGRAPHYENTRYCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXBIBLIOGRAPHYENTRYCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXBIBLIOGRAPHYENTRYCONTEXT_HXX
 
 #include "XMLIndexSimpleEntryContext.hxx"
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
index 83fcfa41e92a..bc90b275997a 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXBIBLIOGRAPHYSOURCECONTEXT_HXX_
-#define _XMLOFF_XMLINDEXBIBLIOGRAPHYSOURCECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXBIBLIOGRAPHYSOURCECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXBIBLIOGRAPHYSOURCECONTEXT_HXX
 
 #include "XMLIndexSourceBaseContext.hxx"
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx
index 8f8b2ee96a00..dfda1c0352e8 100644
--- a/xmloff/source/text/XMLIndexBodyContext.hxx
+++ b/xmloff/source/text/XMLIndexBodyContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXBODYCONTEXT_HXX_
-#define _XMLOFF_XMLINDEXBODYCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXBODYCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXBODYCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
index b59385faaa28..d6bdb2cae7f9 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXCHAPTERINFOENTRYCONTEXT_HXX_
-#define _XMLOFF_XMLINDEXCHAPTERINFOENTRYCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXCHAPTERINFOENTRYCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXCHAPTERINFOENTRYCONTEXT_HXX
 
 #include "XMLIndexSimpleEntryContext.hxx"
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
index d4d0b817f994..056de02a4ac8 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXILLUSTRATIONSOURCECONTEXT_HXX_
-#define _XMLOFF_XMLINDEXILLUSTRATIONSOURCECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXILLUSTRATIONSOURCECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXILLUSTRATIONSOURCECONTEXT_HXX
 
 #include "XMLIndexTableSourceContext.hxx"
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx
index 594e18ece20d..b4cd219de46c 100644
--- a/xmloff/source/text/XMLIndexMarkExport.hxx
+++ b/xmloff/source/text/XMLIndexMarkExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXMARKEXPORT_HXX_
-#define _XMLOFF_XMLINDEXMARKEXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXMARKEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXMARKEXPORT_HXX
 
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
index 454ed63afe68..790364e9a05b 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXOBJECTSOURCECONTEXT_HXX_
-#define _XMLOFF_XMLINDEXOBJECTSOURCECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXOBJECTSOURCECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXOBJECTSOURCECONTEXT_HXX
 
 #include "XMLIndexSourceBaseContext.hxx"
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
index aef04cc31859..589899b6e1b2 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXSIMPLEENTRYCONTEXT_HXX_
-#define _XMLOFF_XMLINDEXSIMPLEENTRYCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXSIMPLEENTRYCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXSIMPLEENTRYCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
index 539338cdf9e3..c4c0fb545d92 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXSOURCEBASECONTEXT_HXX_
-#define _XMLOFF_XMLINDEXSOURCEBASECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXSOURCEBASECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXSOURCEBASECONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
index b81064591e30..b286511baecc 100644
--- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXSPANENTRYCONTEXT_HXX_
-#define _XMLOFF_XMLINDEXSPANENTRYCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXSPANENTRYCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXSPANENTRYCONTEXT_HXX
 
 #include "XMLIndexSimpleEntryContext.hxx"
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx
index 61f3e5b8e026..2aec12be2bca 100644
--- a/xmloff/source/text/XMLIndexTOCContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXTOCCONTEXT_HXX_
-#define _XMLOFF_XMLINDEXTOCCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTOCCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTOCCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
index dd9a6c81e3ed..f519df0db1cb 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXTOCSOURCECONTEXT_HXX_
-#define _XMLOFF_XMLINDEXTOCSOURCECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTOCSOURCECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTOCSOURCECONTEXT_HXX
 
 #include "XMLIndexSourceBaseContext.hxx"
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
index 9ce3ee8fe663..4ca00074de26 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXTOCSTYLESCONTEXT_HXX_
-#define _XMLOFF_XMLINDEXTOCSTYLESCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTOCSTYLESCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTOCSTYLESCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
index f27901d4ecf0..ce0ad27c1db4 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXTABSTOPENTRYCONTEXT_HXX_
-#define _XMLOFF_XMLINDEXTABSTOPENTRYCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTABSTOPENTRYCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTABSTOPENTRYCONTEXT_HXX
 
 #include "XMLIndexSimpleEntryContext.hxx"
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx
index 4c3fb7cc0dad..a663d15e9b35 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXTABLESOURCECONTEXT_HXX_
-#define _XMLOFF_XMLINDEXTABLESOURCECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTABLESOURCECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTABLESOURCECONTEXT_HXX
 
 #include "XMLIndexSourceBaseContext.hxx"
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx
index f67c92c082c5..be067639e36c 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXTEMPLATECONTEXT_HXX_
-#define _XMLOFF_XMLINDEXTEMPLATECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTEMPLATECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTEMPLATECONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
index fd60dd7022de..9410393a26bc 100644
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXTITLETEMPLATECONTEXT_HXX_
-#define _XMLOFF_XMLINDEXTITLETEMPLATECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTITLETEMPLATECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXTITLETEMPLATECONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx
index b69c6a9440b8..97f54f340835 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXUSERSOURCECONTEXT_HXX_
-#define _XMLOFF_XMLINDEXUSERSOURCECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXUSERSOURCECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLINDEXUSERSOURCECONTEXT_HXX
 
 #include "XMLIndexSourceBaseContext.hxx"
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLLineNumberingExport.hxx b/xmloff/source/text/XMLLineNumberingExport.hxx
index 726511d64e06..2848d3082ea2 100644
--- a/xmloff/source/text/XMLLineNumberingExport.hxx
+++ b/xmloff/source/text/XMLLineNumberingExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLLINENUMBERINGEXPORT_HXX_
-#define _XMLOFF_XMLLINENUMBERINGEXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLLINENUMBERINGEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLLINENUMBERINGEXPORT_HXX
 
 
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
index 6cff4014ed0c..c0644e60b838 100644
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLLINENUMBERINGSEPARATORIMPORTCONTEXT_HXX_
-#define _XMLOFF_XMLLINENUMBERINGSEPARATORIMPORTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLLINENUMBERINGSEPARATORIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLLINENUMBERINGSEPARATORIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index 28c6b2ff3cb0..92266f88e1a7 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _XMLOFF_XMLPROPERTYBACKPATCHER_HXX
-#define _XMLOFF_XMLPROPERTYBACKPATCHER_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLPROPERTYBACKPATCHER_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLPROPERTYBACKPATCHER_HXX
 
 #include <map>
 #include <vector>
diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx
index 0b105301bcba..59f21774b9a2 100644
--- a/xmloff/source/text/XMLRedlineExport.hxx
+++ b/xmloff/source/text/XMLRedlineExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLREDLINEEXPORT_HXX
-#define _XMLOFF_XMLREDLINEEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLREDLINEEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLREDLINEEXPORT_HXX
 
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx
index f0cabf3ea614..503e36e6dfbc 100644
--- a/xmloff/source/text/XMLSectionExport.hxx
+++ b/xmloff/source/text/XMLSectionExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSECTIONEXPORT_HXX_
-#define _XMLOFF_XMLSECTIONEXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONEXPORT_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
index a97119635977..b899fc1b03b3 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _XMLOFF_XMLSECTIONFOOTNOTECONFIGEXPORT_HXX
-#define _XMLOFF_XMLSECTIONFOOTNOTECONFIGEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONFOOTNOTECONFIGEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONFOOTNOTECONFIGEXPORT_HXX
 
 #include <sal/types.h>
 
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
index 11d3e6032467..c374a1c53946 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _XMLOFF_XMLSECTIONFOOTNOTECONFIGIMPORT_HXX
-#define _XMLOFF_XMLSECTIONFOOTNOTECONFIGIMPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONFOOTNOTECONFIGIMPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONFOOTNOTECONFIGIMPORT_HXX
 
 
 #include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx
index c8a4455d4c12..5b71436d27bd 100644
--- a/xmloff/source/text/XMLSectionImportContext.hxx
+++ b/xmloff/source/text/XMLSectionImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSECTIONIMPORTCONTEXT_HXX_
-#define _XMLOFF_XMLSECTIONIMPORTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
index 865ede4deab3..a823faa1658d 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSECTIONSOURCEDDEIMPORTCONTEXT_HXX_
-#define _XMLOFF_XMLSECTIONSOURCEDDEIMPORTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONSOURCEDDEIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONSOURCEDDEIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx
index 7111f22919a5..7e86a4de63b9 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSECTIONSOURCEIMPORTCONTEXT_HXX_
-#define _XMLOFF_XMLSECTIONSOURCEIMPORTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONSOURCEIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONSOURCEIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
index 62995b94d62f..9ceeb6ea8ded 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLTEXTCHARSTYLENAMESELEMENTEXPORT_HXX
-#define _XMLOFF_XMLTEXTCHARSTYLENAMESELEMENTEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTCHARSTYLENAMESELEMENTEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTCHARSTYLENAMESELEMENTEXPORT_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 4c0167186e97..5d614ed8a246 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLTEXTFRAMECONTEXT_HXX
-#define _XMLTEXTFRAMECONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTFRAMECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTFRAMECONTEXT_HXX
 
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index b44603938ace..19f4bd8a49fb 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLTEXTFRAMEHYPERLINKCONTEXT_HXX
-#define _XMLTEXTFRAMEHYPERLINKCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTFRAMEHYPERLINKCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTFRAMEHYPERLINKCONTEXT_HXX
 
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/XTextFrame.hpp>
diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx
index 7d9440c70af3..4172c107a318 100644
--- a/xmloff/source/text/XMLTextListBlockContext.hxx
+++ b/xmloff/source/text/XMLTextListBlockContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLTEXTLISTBLOCKCONTEXT_HXX
-#define _XMLTEXTLISTBLOCKCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTLISTBLOCKCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTLISTBLOCKCONTEXT_HXX
 
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx
index ac71e7a2c99e..661c30625209 100644
--- a/xmloff/source/text/XMLTextListItemContext.hxx
+++ b/xmloff/source/text/XMLTextListItemContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLTEXTLISTITEMCONTEXT_HXX
-#define _XMLTEXTLISTITEMCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTLISTITEMCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTLISTITEMCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx
index 061ecc73a386..d7ae57e12868 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.hxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _XMLOFF_XMLTEXTMARKIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLTEXTMARKIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTMARKIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTMARKIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 5c919f267b55..7fe191098b24 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLTEXTNUMRULEINFO_HXX
-#define _XMLOFF_XMLTEXTNUMRULEINFO_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTNUMRULEINFO_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTNUMRULEINFO_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/container/XIndexReplace.hpp>
@@ -173,6 +173,6 @@ inline void XMLTextNumRuleInfo::Reset()
     mbContinueingPreviousSubTree = sal_False;
     msListLabelString = "";
 }
-#endif  //  _XMLOFF_XMLTEXTNUMRULEINFO_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTNUMRULEINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx
index ef36f5a980a6..4adb945e3b10 100644
--- a/xmloff/source/text/XMLTextPropertySetContext.hxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLTEXTPROPERTYSETCONTEXT_HXX
-#define _XMLOFF_XMLTEXTPROPERTYSETCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTPROPERTYSETCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTPROPERTYSETCONTEXT_HXX
 
 #include <xmloff/xmlprcon.hxx>
 
@@ -51,6 +51,6 @@ public:
 };
 
 
-#endif  //  _XMLOFF_XMLTEXTPROPERTYSETCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTPROPERTYSETCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
index c0748e046a0a..711d718b46a3 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _XMLOFF_XMLTRACKEDCHANGESIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLTRACKEDCHANGESIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTRACKEDCHANGESIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTRACKEDCHANGESIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx
index 011aee4affa1..85bff617bdac 100644
--- a/xmloff/source/text/txtdrope.hxx
+++ b/xmloff/source/text/txtdrope.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_TXTDROPE_HXX
-#define _XMLOFF_TXTDROPE_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_TXTDROPE_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_TXTDROPE_HXX
 
 
 class SvXMLExport;
diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx
index 05c9cb9b7b78..024840e84381 100644
--- a/xmloff/source/text/txtdropi.hxx
+++ b/xmloff/source/text/txtdropi.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TXTDROPI_HXX
-#define _TXTDROPI_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_TXTDROPI_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_TXTDROPI_HXX
 
 #include "XMLElementPropertyContext.hxx"
 
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index 204141869564..191850dbf2f0 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_TXTEXPPR_HXX
-#define _XMLOFF_TXTEXPPR_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_TXTEXPPR_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_TXTEXPPR_HXX
 
 
 #include <xmloff/xmlexppr.hxx>
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 2c4376081baf..683d94d9c7e8 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_TEXTPARAI_HXX_
-#define _XMLOFF_TEXTPARAI_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_TXTPARAI_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_TXTPARAI_HXX
 
 
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index 192c45b85465..5cce41e9316a 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_TXTPARAIMPHINT_HXX
-#define _XMLOFF_TXTPARAIMPHINT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_TXTPARAIMPHINT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_TXTPARAIMPHINT_HXX
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/xmloff/source/text/txtprhdl.hxx b/xmloff/source/text/txtprhdl.hxx
index f23f81a887bf..27a5918d6db4 100644
--- a/xmloff/source/text/txtprhdl.hxx
+++ b/xmloff/source/text/txtprhdl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_TEXTPRHDL_HXX_
-#define _XMLOFF_TEXTPRHDL_HXX_
+#ifndef INCLUDED_XMLOFF_SOURCE_TEXT_TXTPRHDL_HXX
+#define INCLUDED_XMLOFF_SOURCE_TEXT_TXTPRHDL_HXX
 
 
 #include <xmloff/prhdlfac.hxx>
diff --git a/xmloff/source/transform/ActionMapTypesOASIS.hxx b/xmloff/source/transform/ActionMapTypesOASIS.hxx
index 9ef86b21f2c0..8a45d9d1e80c 100644
--- a/xmloff/source/transform/ActionMapTypesOASIS.hxx
+++ b/xmloff/source/transform/ActionMapTypesOASIS.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ACTIONMAPTYPESOASIS_HXX
-#define _XMLOFF_ACTIONMAPTYPESOASIS_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_ACTIONMAPTYPESOASIS_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_ACTIONMAPTYPESOASIS_HXX
 
 enum ActionMapTypesOOo
 {
@@ -85,6 +85,6 @@ enum ActionMapTypesOOo
     MAX_OASIS_ACTIONS
 };
 
-#endif  //  _XMLOFF_ACTIONMAPTYPESOASIS_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_ACTIONMAPTYPESOASIS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/ActionMapTypesOOo.hxx b/xmloff/source/transform/ActionMapTypesOOo.hxx
index 8e1b9eeb4a96..fca37c286a3d 100644
--- a/xmloff/source/transform/ActionMapTypesOOo.hxx
+++ b/xmloff/source/transform/ActionMapTypesOOo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ACTIONMAPTYPESOOO_HXX
-#define _XMLOFF_ACTIONMAPTYPESOOO_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_ACTIONMAPTYPESOOO_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_ACTIONMAPTYPESOOO_HXX
 
 enum ActionMapTypesOOo
 {
@@ -82,6 +82,6 @@ enum ActionMapTypesOOo
     MAX_OOO_ACTIONS
 };
 
-#endif  //  _XMLOFF_ACTIONMAPTYPESOOO_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_ACTIONMAPTYPESOOO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/AttrTransformerAction.hxx b/xmloff/source/transform/AttrTransformerAction.hxx
index d657dea80380..7800af58aad6 100644
--- a/xmloff/source/transform/AttrTransformerAction.hxx
+++ b/xmloff/source/transform/AttrTransformerAction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ATTRTRANSFORMERACTION_HXX
-#define _XMLOFF_ATTRTRANSFORMERACTION_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_ATTRTRANSFORMERACTION_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_ATTRTRANSFORMERACTION_HXX
 
 #include "TransformerAction.hxx"
 
@@ -131,6 +131,6 @@ enum XMLAttrTransformerAction
     XML_ATACTION_END=XML_TACTION_END
 };
 
-#endif  //  _XMLOFF_ATTRTRANSFORMERACTION_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_ATTRTRANSFORMERACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/ChartOASISTContext.hxx b/xmloff/source/transform/ChartOASISTContext.hxx
index ec4157d0ddd5..8a3b5e722403 100644
--- a/xmloff/source/transform/ChartOASISTContext.hxx
+++ b/xmloff/source/transform/ChartOASISTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_CHARTOASISTCONTEXT_HXX
-#define _XMLOFF_CHARTOASISTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTOASISTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTOASISTCONTEXT_HXX
 
 #include "TransformerContext.hxx"
 
@@ -34,6 +34,6 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
 
-#endif  //  _XMLOFF_CHARTOASISTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTOASISTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/ChartOOoTContext.hxx b/xmloff/source/transform/ChartOOoTContext.hxx
index 16c9372c586b..32624a919b5f 100644
--- a/xmloff/source/transform/ChartOOoTContext.hxx
+++ b/xmloff/source/transform/ChartOOoTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_CHARTOOOTCONTEXT_HXX
-#define _XMLOFF_CHARTOOOTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTOOOTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTOOOTCONTEXT_HXX
 
 #include "TransformerContext.hxx"
 
@@ -34,6 +34,6 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
 
-#endif  //  _XMLOFF_CHARTOOOTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTOOOTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
index ce63a8c88127..da69b1904376 100644
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef XMLOFF_XMLCHARTPLOTAREAOASISTCONTEXT_HXX
-#define XMLOFF_XMLCHARTPLOTAREAOASISTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTPLOTAREAOASISTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTPLOTAREAOASISTCONTEXT_HXX
 
 #include "ProcAttrTContext.hxx"
 #include "PersAttrListTContext.hxx"
@@ -44,7 +44,7 @@ private:
     ::rtl::Reference< XMLPersAttrListTContext > m_rCategoriesContext;
 };
 
-// XMLOFF_XMLCHARTPLOTAREAOASISTCONTEXT_HXX
+// INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTPLOTAREAOASISTCONTEXT_HXX
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
index c7528033fb50..c0a9dc7ae849 100644
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef XMLOFF_XMLCHARTPLOTAREAOOOTCONTEXT_HXX
-#define XMLOFF_XMLCHARTPLOTAREAOOOTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTPLOTAREAOOOTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTPLOTAREAOOOTCONTEXT_HXX
 
 #include "ProcAttrTContext.hxx"
 #include "TContextVector.hxx"
@@ -52,7 +52,7 @@ private:
     XMLAxisContextVector m_aChildContexts;
 };
 
-// XMLOFF_XMLCHARTPLOTAREAOOOTCONTEXT_HXX
+// INCLUDED_XMLOFF_SOURCE_TRANSFORM_CHARTPLOTAREAOOOTCONTEXT_HXX
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx
index 42a217c5ad3c..4d86cd785a18 100644
--- a/xmloff/source/transform/ControlOASISTContext.hxx
+++ b/xmloff/source/transform/ControlOASISTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_CONTROLASISTCONTEXT_HXX
-#define _XMLOFF_CONTROLASISTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_CONTROLOASISTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_CONTROLOASISTCONTEXT_HXX
 
 #include "TransformerContext.hxx"
 
@@ -41,6 +41,6 @@ public:
     virtual void EndElement();
 };
 
-#endif  //  _XMLOFF_CONTROLASISTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_CONTROLOASISTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx
index f37fd776d1eb..196b2f9aa014 100644
--- a/xmloff/source/transform/ControlOOoTContext.hxx
+++ b/xmloff/source/transform/ControlOOoTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_CONTROLOOOTCONTEXT_HXX
-#define _XMLOFF_CONTROLOOOTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_CONTROLOOOTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_CONTROLOOOTCONTEXT_HXX
 
 #include "TransformerContext.hxx"
 
@@ -49,6 +49,6 @@ public:
     virtual void Characters( const OUString& rChars );
 };
 
-#endif  //  _XMLOFF_CONTROLOOOTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_CONTROLOOOTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx
index 780a16d95522..6b777a2df81e 100644
--- a/xmloff/source/transform/CreateElemTContext.hxx
+++ b/xmloff/source/transform/CreateElemTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_CREATEELEMTCONTEXT_HXX
-#define _XMLOFF_CREATEELEMTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_CREATEELEMTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_CREATEELEMTCONTEXT_HXX
 
 #include <xmloff/xmltoken.hxx>
 #include "TransformerContext.hxx"
diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx
index 7155384eaf17..7cf5e8d132b1 100644
--- a/xmloff/source/transform/DeepTContext.hxx
+++ b/xmloff/source/transform/DeepTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_DEEPTCONTEXT_HXX
-#define _XMLOFF_DEEPTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_DEEPTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_DEEPTCONTEXT_HXX
 
 #include <rtl/ref.hxx>
 
@@ -72,6 +72,6 @@ public:
     virtual void ExportContent();
 };
 
-#endif  //  _XMLOFF_DEEPTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DEEPTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/DlgOASISTContext.hxx b/xmloff/source/transform/DlgOASISTContext.hxx
index 3e3cf9527988..9e4318c198cf 100644
--- a/xmloff/source/transform/DlgOASISTContext.hxx
+++ b/xmloff/source/transform/DlgOASISTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_DLGOASISTCONTEXT_HXX
-#define _XMLOFF_DLGOASISTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_DLGOASISTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_DLGOASISTCONTEXT_HXX
 
 #include "TransformerContext.hxx"
 
@@ -34,6 +34,6 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
 
-#endif  //  _XMLOFF_DLGOASISTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DLGOASISTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/DocumentTContext.hxx b/xmloff/source/transform/DocumentTContext.hxx
index 06c44215b500..e2bf9bb754b2 100644
--- a/xmloff/source/transform/DocumentTContext.hxx
+++ b/xmloff/source/transform/DocumentTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_DOCUMENTTCONTEXT_HXX
-#define _XMLOFF_DOCUMENTTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_DOCUMENTTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_DOCUMENTTCONTEXT_HXX
 
 #include "TransformerContext.hxx"
 
@@ -46,6 +46,6 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
 
-#endif  //  _XMLOFF_DOCUMENTTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DOCUMENTTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/ElemTransformerAction.hxx b/xmloff/source/transform/ElemTransformerAction.hxx
index 09bb60457157..04f7dda91dc9 100644
--- a/xmloff/source/transform/ElemTransformerAction.hxx
+++ b/xmloff/source/transform/ElemTransformerAction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ELEMTRANSFORMERACTION_HXX
-#define _XMLOFF_ELEMTRANSFORMERACTION_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_ELEMTRANSFORMERACTION_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_ELEMTRANSFORMERACTION_HXX
 
 #include "TransformerAction.hxx"
 
@@ -85,6 +85,6 @@ enum XMLElemTransformerAction
     XML_ETACTION_END=XML_TACTION_END
 };
 
-#endif  //  _XMLOFF_ELEMTRANSFORMERACTION_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_ELEMTRANSFORMERACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/EventMap.hxx b/xmloff/source/transform/EventMap.hxx
index ce184463065f..410c012d98b8 100644
--- a/xmloff/source/transform/EventMap.hxx
+++ b/xmloff/source/transform/EventMap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_EVENTMAP_HXX
-#define _XMLOFF_EVENTMAP_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTMAP_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTMAP_HXX
 
 #include "TransformerContext.hxx"
 
@@ -32,6 +32,6 @@ struct XMLTransformerEventMapEntry
 extern XMLTransformerEventMapEntry aTransformerEventMap[];
 extern XMLTransformerEventMapEntry aFormTransformerEventMap[];
 
-#endif  //  _XMLOFF_EVENTMAP_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/EventOASISTContext.hxx b/xmloff/source/transform/EventOASISTContext.hxx
index 6a8c38f81c18..ad3a89d65f58 100644
--- a/xmloff/source/transform/EventOASISTContext.hxx
+++ b/xmloff/source/transform/EventOASISTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_EVENTOASISTCONTEXT_HXX
-#define _XMLOFF_EVENTOASISTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTOASISTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTOASISTCONTEXT_HXX
 
 #include "RenameElemTContext.hxx"
 
@@ -44,6 +44,6 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
 
-#endif  //  _XMLOFF_EVENTOASISTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTOASISTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx
index 76b955ae99d8..1e00369c3791 100644
--- a/xmloff/source/transform/EventOOoTContext.hxx
+++ b/xmloff/source/transform/EventOOoTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_EVENTOOOTCONTEXT_HXX
-#define _XMLOFF_EVENTOOOTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTOOOTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTOOOTCONTEXT_HXX
 
 #include "DeepTContext.hxx"
 
@@ -52,6 +52,6 @@ public:
     virtual sal_Bool IsPersistent() const;
 };
 
-#endif  //  _XMLOFF_EVENTOOOTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTOOOTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/FamilyType.hxx b/xmloff/source/transform/FamilyType.hxx
index 700c0b54d33d..cbc825d049a9 100644
--- a/xmloff/source/transform/FamilyType.hxx
+++ b/xmloff/source/transform/FamilyType.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FAMILYTYPE_HXX
-#define _XMLOFF_FAMILYTYPE_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_FAMILYTYPE_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_FAMILYTYPE_HXX
 
 enum XMLFamilyType
 {
@@ -48,6 +48,6 @@ enum XMLFamilyType
     XML_FAMILY_TYPE_END
 };
 
-#endif  //  _XMLOFF_FAMILYTYPE_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FAMILYTYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx
index 2fd24b408def..bbb6d06e6512 100644
--- a/xmloff/source/transform/FlatTContext.hxx
+++ b/xmloff/source/transform/FlatTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FLATTCONTEXT_HXX
-#define _XMLOFF_FLATTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_FLATTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_FLATTCONTEXT_HXX
 
 #include "PersAttrListTContext.hxx"
 
@@ -58,6 +58,6 @@ public:
     const OUString& GetTextContent() const { return m_aCharacters; }
 };
 
-#endif  //  _XMLOFF_FLATTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FLATTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx
index 1dc4e7d02c40..7bef55c2e592 100644
--- a/xmloff/source/transform/FormPropOASISTContext.hxx
+++ b/xmloff/source/transform/FormPropOASISTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMPROPOASISTCONTEXT_HXX
-#define _XMLOFF_FORMPROPOASISTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_FORMPROPOASISTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_FORMPROPOASISTCONTEXT_HXX
 
 #include "RenameElemTContext.hxx"
 
@@ -43,6 +43,6 @@ public:
     virtual void EndElement();
 };
 
-#endif  //  _XMLOFF_FORMPROPOASISTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FORMPROPOASISTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx
index e8c6f21f6f3a..8eae5124beb1 100644
--- a/xmloff/source/transform/FormPropOOoTContext.hxx
+++ b/xmloff/source/transform/FormPropOOoTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FORMPROPOOOTCONTEXT_HXX
-#define _XMLOFF_FORMPROPOOOTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_FORMPROPOOOTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_FORMPROPOOOTCONTEXT_HXX
 
 #include <rtl/ref.hxx>
 #include "TransformerContext.hxx"
@@ -58,6 +58,6 @@ public:
     virtual void EndElement();
 };
 
-#endif  //  _XMLOFF_FORMPROPOOOTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FORMPROPOOOTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx
index 6128eb6e0072..57434018f4ed 100644
--- a/xmloff/source/transform/FrameOASISTContext.hxx
+++ b/xmloff/source/transform/FrameOASISTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FRAMEOASISTCONTEXT_HXX
-#define _XMLOFF_FRAMEOASISTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_FRAMEOASISTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_FRAMEOASISTCONTEXT_HXX
 
 #include "TransformerContext.hxx"
 
@@ -56,6 +56,6 @@ public:
     virtual void Characters( const OUString& rChars );
 };
 
-#endif  //  _XMLOFF_FRAMEOASISTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FRAMEOASISTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx
index 6169cd313033..75bb89370544 100644
--- a/xmloff/source/transform/FrameOOoTContext.hxx
+++ b/xmloff/source/transform/FrameOOoTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_FRAMEOOOTCONTEXT_HXX
-#define _XMLOFF_FRAMEOOOTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_FRAMEOOOTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_FRAMEOOOTCONTEXT_HXX
 
 #include "DeepTContext.hxx"
 
@@ -48,6 +48,6 @@ public:
     virtual sal_Bool IsPersistent() const;
 };
 
-#endif  //  _XMLOFF_FRAMEOOOTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FRAMEOOOTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx
index b5053a21beeb..cf7a8f1e912f 100644
--- a/xmloff/source/transform/IgnoreTContext.hxx
+++ b/xmloff/source/transform/IgnoreTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_IGNORETCONTEXT_HXX
-#define _XMLOFF_IGNORETCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_IGNORETCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_IGNORETCONTEXT_HXX
 
 #include "TransformerContext.hxx"
 
@@ -77,6 +77,6 @@ public:
     virtual void Characters( const OUString& rChars );
 };
 
-#endif  //  _XMLOFF_IGNORETCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_IGNORETCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx
index 557795c569ca..434b14a96426 100644
--- a/xmloff/source/transform/MergeElemTContext.hxx
+++ b/xmloff/source/transform/MergeElemTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_MERGEELEMTCONTEXT_HXX
-#define _XMLOFF_MERGEELEMTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_MERGEELEMTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_MERGEELEMTCONTEXT_HXX
 
 #include <rtl/ref.hxx>
 #include "FlatTContext.hxx"
diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx
index 3fbf4b5854bc..be8ac95ad354 100644
--- a/xmloff/source/transform/MetaTContext.hxx
+++ b/xmloff/source/transform/MetaTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_METATCONTEXT_HXX
-#define _XMLOFF_METATCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_METATCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_METATCONTEXT_HXX
 
 #include <rtl/ref.hxx>
 #include <comphelper/stl_types.hxx>
@@ -68,6 +68,6 @@ public:
     virtual void Characters( const OUString& rChars );
 };
 
-#endif  //  _XMLOFF_METATCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_METATCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx
index 921cd2ba8f87..eb2291e4a0e2 100644
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_MUTABLEATTRLIST_HXX
-#define _XMLOFF_MUTABLEATTRLIST_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_MUTABLEATTRLIST_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_MUTABLEATTRLIST_HXX
 
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
@@ -75,6 +75,6 @@ public:
 };
 
 
-#endif  //  _XMLOFF_MUTABLEATTRLIST_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_MUTABLEATTRLIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx
index 4666e824a433..be944343e21d 100644
--- a/xmloff/source/transform/NotesTContext.hxx
+++ b/xmloff/source/transform/NotesTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_NOTESTCONTEXT_HXX
-#define _XMLOFF_NOTESTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_NOTESTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_NOTESTCONTEXT_HXX
 
 #include "DeepTContext.hxx"
 
@@ -49,6 +49,6 @@ public:
     virtual sal_Bool IsPersistent() const;
 };
 
-#endif  //  _XMLOFF_NOTESTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_NOTESTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx
index 224e67b3881b..628ce1baefa8 100644
--- a/xmloff/source/transform/OOo2Oasis.hxx
+++ b/xmloff/source/transform/OOo2Oasis.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_OOO2OASIS_HXX
-#define _XMLOFF_OOO2OASIS_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_OOO2OASIS_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_OOO2OASIS_HXX
 
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
@@ -101,6 +101,6 @@ public:
                                             sal_Bool bForm = sal_False );
 };
 
-#endif  //  _XMLOFF_TRANSFORMER_BASE_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_OOO2OASIS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx
index cb8b4e74a2e1..a2670d944c41 100644
--- a/xmloff/source/transform/Oasis2OOo.hxx
+++ b/xmloff/source/transform/Oasis2OOo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_OASIS2OOO_HXX
-#define _XMLOFF_OASIS2OOO_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_OASIS2OOO_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_OASIS2OOO_HXX
 
 #include "ActionMapTypesOASIS.hxx"
 #include "TransformerBase.hxx"
@@ -58,6 +58,6 @@ public:
                                              sal_Bool bForm );
 };
 
-#endif  //  _XMLOFF_OASIS2OOO_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_OASIS2OOO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx
index 346c1bf7d284..a31a57068e7e 100644
--- a/xmloff/source/transform/PersAttrListTContext.hxx
+++ b/xmloff/source/transform/PersAttrListTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PERSATTRLISTTCONTEXT_HXX
-#define _XMLOFF_PERSATTRLISTTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PERSATTRLISTTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PERSATTRLISTTCONTEXT_HXX
 
 #include <xmloff/xmltoken.hxx>
 #include "TransformerContext.hxx"
@@ -110,6 +110,6 @@ public:
         GetAttrList() const;
 };
 
-#endif  //  _XMLOFF_PERSATTRLISTTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_PERSATTRLISTTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/PersMixedContentTContext.hxx b/xmloff/source/transform/PersMixedContentTContext.hxx
index f0564fb4ea67..54f0902eceb4 100644
--- a/xmloff/source/transform/PersMixedContentTContext.hxx
+++ b/xmloff/source/transform/PersMixedContentTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PERSMIXEDCONTENTTCONTEXT_HXX
-#define _XMLOFF_PERSMIXEDCONTENTTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PERSMIXEDCONTENTTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PERSMIXEDCONTENTTCONTEXT_HXX
 
 #include <rtl/ref.hxx>
 
@@ -57,6 +57,6 @@ public:
     virtual ~XMLPersMixedContentTContext();
 };
 
-#endif  //  _XMLOFF_PERSMIXEDCONTENTTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_PERSMIXEDCONTENTTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx
index cda05fe5e825..91ac323b11e7 100644
--- a/xmloff/source/transform/ProcAddAttrTContext.hxx
+++ b/xmloff/source/transform/ProcAddAttrTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROCADDATTRTCONTEXT_HXX
-#define _XMLOFF_PROCADDATTRTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROCADDATTRTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROCADDATTRTCONTEXT_HXX
 
 #include "ProcAttrTContext.hxx"
 
diff --git a/xmloff/source/transform/ProcAttrTContext.hxx b/xmloff/source/transform/ProcAttrTContext.hxx
index aa57ac1e2468..32daf09142cf 100644
--- a/xmloff/source/transform/ProcAttrTContext.hxx
+++ b/xmloff/source/transform/ProcAttrTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROCATTRTCONTEXT_HXX
-#define _XMLOFF_PROCATTRTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROCATTRTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROCATTRTCONTEXT_HXX
 
 #include <xmloff/xmltoken.hxx>
 #include "TransformerContext.hxx"
diff --git a/xmloff/source/transform/PropType.hxx b/xmloff/source/transform/PropType.hxx
index 592a78f5111d..2b15d36743bc 100644
--- a/xmloff/source/transform/PropType.hxx
+++ b/xmloff/source/transform/PropType.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPTYPE_HXX
-#define _XMLOFF_PROPTYPE_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPTYPE_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPTYPE_HXX
 
 enum  XMLPropType
 {
@@ -39,6 +39,6 @@ enum  XMLPropType
     XML_PROP_TYPE_END
 };
 
-#endif  //  _XMLOFF_PROPTYPE_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPTYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/PropertyActionsOASIS.hxx b/xmloff/source/transform/PropertyActionsOASIS.hxx
index 759d6f80ee32..dcf51cb02772 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.hxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYACTIONSOASIS_HXX
-#define _XMLOFF_PROPERTYACTIONSOASIS_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOASIS_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOASIS_HXX
 
 #include "TransformerAction.hxx"
 #include "TransformerActionInit.hxx"
@@ -64,6 +64,6 @@ extern XMLTransformerActionInit aTableCellPropertyOASISAttrActionTable[];
 extern XMLTransformerActionInit aListLevelPropertyOASISAttrActionTable[];
 extern XMLTransformerActionInit aChartPropertyOASISAttrActionTable[];
 
-#endif  //  _XMLOFF_PROPERTYACTIONSOASIS_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOASIS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/PropertyActionsOOo.hxx b/xmloff/source/transform/PropertyActionsOOo.hxx
index 3492f5a1c944..9f7e97e62154 100644
--- a/xmloff/source/transform/PropertyActionsOOo.hxx
+++ b/xmloff/source/transform/PropertyActionsOOo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYACTIONSOOO_HXX
-#define _XMLOFF_PROPERTYACTIONSOOO_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOOO_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOOO_HXX
 
 #include "TransformerAction.hxx"
 #include "TransformerActionInit.hxx"
@@ -67,6 +67,6 @@ extern XMLTransformerActionInit aListLevelPropertyOOoAttrActionTable[];
 extern XMLTransformerActionInit aChartPropertyOOoAttrActionTable[];
 extern XMLTransformerActionInit aChartPropertyOOoElemActionTable[];
 
-#endif  //  _XMLOFF_PROPERTYACTIONSOOO_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOOO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/RenameElemTContext.hxx b/xmloff/source/transform/RenameElemTContext.hxx
index b33a018110dc..e1191ecbab62 100644
--- a/xmloff/source/transform/RenameElemTContext.hxx
+++ b/xmloff/source/transform/RenameElemTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_RENAMEELEMTCONTEXT_HXX
-#define _XMLOFF_RENAMEELEMTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_RENAMEELEMTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_RENAMEELEMTCONTEXT_HXX
 
 #include <xmloff/xmltoken.hxx>
 #include "TransformerContext.hxx"
diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx
index fd5464f89bc6..d3e528d8f2a3 100644
--- a/xmloff/source/transform/StyleOASISTContext.hxx
+++ b/xmloff/source/transform/StyleOASISTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_STYLEOASISTCONTEXT_HXX
-#define _XMLOFF_STYLEOASISTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_STYLEOASISTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_STYLEOASISTCONTEXT_HXX
 
 #include <rtl/ref.hxx>
 #include "DeepTContext.hxx"
@@ -64,6 +64,6 @@ public:
     static XMLTransformerActions *CreateTransformerActions( sal_uInt16 nType );
 };
 
-#endif  //  _XMLOFF_STYLEOASISTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_STYLEOASISTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx
index 351cc03166fa..7eb9a3d18427 100644
--- a/xmloff/source/transform/StyleOOoTContext.hxx
+++ b/xmloff/source/transform/StyleOOoTContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_STYLEOOOTCONTEXT_HXX
-#define _XMLOFF_STYLEOOOTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_STYLEOOOTCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_STYLEOOOTCONTEXT_HXX
 
 #include <rtl/ref.hxx>
 #include "FamilyType.hxx"
@@ -63,6 +63,6 @@ public:
 
 };
 
-#endif  //  _XMLOFF_STYLEOOOTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_STYLEOOOTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/TContextVector.hxx b/xmloff/source/transform/TContextVector.hxx
index bc7f86bbf93c..ed4e62a3da75 100644
--- a/xmloff/source/transform/TContextVector.hxx
+++ b/xmloff/source/transform/TContextVector.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TCONTEXTVECTOR_HXX
-#define _XMLOFF_TCONTEXTVECTOR_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_TCONTEXTVECTOR_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TCONTEXTVECTOR_HXX
 
 #include <rtl/ref.hxx>
 
@@ -30,6 +30,6 @@ class XMLTransformerContextVector :
 {
 };
 
-#endif  //  _XMLOFF_TCONTEXTVECTOR_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TCONTEXTVECTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/Transformer.hxx b/xmloff/source/transform/Transformer.hxx
index 53ca74b21a81..43771546a401 100644
--- a/xmloff/source/transform/Transformer.hxx
+++ b/xmloff/source/transform/Transformer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TRANSFORMER_HXX
-#define _XMLOFF_TRANSFORMER_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMER_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMER_HXX
 
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -34,6 +34,6 @@ class XMLTransformer : public ::cppu::WeakImplHelper4<
 {
 };
 
-#endif  //  _XMLOFF_TRANSFORMER_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/TransformerAction.hxx b/xmloff/source/transform/TransformerAction.hxx
index 50cd7f4bad2d..d3571ba0ccb3 100644
--- a/xmloff/source/transform/TransformerAction.hxx
+++ b/xmloff/source/transform/TransformerAction.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TRANSFORMERACTION_HXX
-#define _XMLOFF_TRANSFORMERACTION_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTION_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTION_HXX
 
 #define XML_TACTION_EOT 0x0000
 #define XML_TACTION_END 0xffff
 
 
-#endif  //  _XMLOFF_TRANSFORMERACTION_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/TransformerActionInit.hxx b/xmloff/source/transform/TransformerActionInit.hxx
index 63555cfb9043..dc0cacc78c41 100644
--- a/xmloff/source/transform/TransformerActionInit.hxx
+++ b/xmloff/source/transform/TransformerActionInit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TRANSFORMERACTIONINIT_HXX
-#define _XMLOFF_TRANSFORMERACTIONINIT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTIONINIT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTIONINIT_HXX
 
 #include <xmloff/xmltoken.hxx>
 
@@ -40,6 +40,6 @@ struct XMLTransformerActionInit
     }
 };
 
-#endif  //  _XMLOFF_TRANSFORMERACTIONINIT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTIONINIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx
index dd25e7b170e2..e28afc7f5a16 100644
--- a/xmloff/source/transform/TransformerActions.hxx
+++ b/xmloff/source/transform/TransformerActions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TRANSFORMERACTIONS_HXX
-#define _XMLOFF_TRANSFORMERACTIONS_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTIONS_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTIONS_HXX
 
 #include <rtl/ustring.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -143,6 +143,6 @@ public:
     void Add( XMLTransformerActionInit *pInit );
 };
 
-#endif  //  _XMLOFF_TRANSFORMERACTIONS_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index 7b64bd7de436..de94241ac51d 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TRANSFORMER_BASE_HXX
-#define _XMLOFF_TRANSFORMER_BASE_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERBASE_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERBASE_HXX
 
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
@@ -194,6 +194,6 @@ public:
 
 };
 
-#endif  //  _XMLOFF_TRANSFORMER_BASE_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx
index a5eb385ee912..0b286e55cd55 100644
--- a/xmloff/source/transform/TransformerContext.hxx
+++ b/xmloff/source/transform/TransformerContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TRANSFORMERCONTEXT_HXX
-#define _XMLOFF_TRANSFORMERCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERCONTEXT_HXX
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <tools/solar.h>
@@ -104,6 +104,6 @@ public:
 };
 
 
-#endif  //  _XMLOFF_TRANSFORMERCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx
index d69373e17962..ca8c43c52360 100644
--- a/xmloff/source/transform/TransformerTokenMap.hxx
+++ b/xmloff/source/transform/TransformerTokenMap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TRANSFORMERTOKENMAPS_HXX
-#define _XMLOFF_TRANSFORMERTOKENMAPS_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERTOKENMAP_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERTOKENMAP_HXX
 
 #include <rtl/ustring.hxx>
 #include <comphelper/stl_types.hxx>
@@ -37,6 +37,6 @@ public:
     ~XMLTransformerTokenMap();
 };
 
-#endif  //  _XMLOFF_TRANSFORMERTOKENMAPS_HXX
+#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERTOKENMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx
index 4f3fd8f99e72..0d1f8636e6d3 100644
--- a/xmloff/source/xforms/SchemaContext.hxx
+++ b/xmloff/source/xforms/SchemaContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_SCHEMACONTEXT_HXX
-#define _XMLOFF_SCHEMACONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_SCHEMACONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_XFORMS_SCHEMACONTEXT_HXX
 
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx
index 0cba7dca116e..4ac1142e1b13 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.hxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_SCHEMARESTRICTIONCONTEXT_HXX
-#define _XMLOFF_SCHEMARESTRICTIONCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_SCHEMARESTRICTIONCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_XFORMS_SCHEMARESTRICTIONCONTEXT_HXX
 
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
index 61c86498474b..4422da35bcbb 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_SCHEMASIMPLETYPECONTEXT_HXX
-#define _XMLOFF_SCHEMASIMPLETYPECONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_SCHEMASIMPLETYPECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_XFORMS_SCHEMASIMPLETYPECONTEXT_HXX
 
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index 5bef1cd32488..9166388ee0d0 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TOKENCONTEXT_HXX
-#define _XMLOFF_TOKENCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_TOKENCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_XFORMS_TOKENCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx
index d92eca2a7aec..69d745ea8da1 100644
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XFORMSBINDCONTEXT_HXX
-#define _XMLOFF_XFORMSBINDCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSBINDCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSBINDCONTEXT_HXX
 
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx
index a01f703253bd..30d5ff8e28bf 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XFORMSINSTANCECONTEXT_HXX
-#define _XMLOFF_XFORMSINSTANCECONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSINSTANCECONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSINSTANCECONTEXT_HXX
 
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index 43d1db977bc2..0d018e84e262 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XFORMSMODELCONTEXT_HXX
-#define _XMLOFF_XFORMSMODELCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSMODELCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSMODELCONTEXT_HXX
 
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/xforms/XFormsModelExport.hxx b/xmloff/source/xforms/XFormsModelExport.hxx
index 07954fad23e2..c00ec871e84a 100644
--- a/xmloff/source/xforms/XFormsModelExport.hxx
+++ b/xmloff/source/xforms/XFormsModelExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XFORMSMODELEXPORT_HXX
-#define _XMLOFF_XFORMSMODELEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSMODELEXPORT_HXX
+#define INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSMODELEXPORT_HXX
 
 #include <sal/types.h>
 
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index 843b704a896a..b38c5984f9f8 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XFORMSSUBMISSIONCONTEXT_HXX
-#define _XMLOFF_XFORMSSUBMISSIONCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSSUBMISSIONCONTEXT_HXX
+#define INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSSUBMISSIONCONTEXT_HXX
 
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx
index 4776197f9eba..1c27b96bc951 100644
--- a/xmloff/source/xforms/xformsapi.hxx
+++ b/xmloff/source/xforms/xformsapi.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XFORMSAPI_HXX
-#define _XMLOFF_XFORMSAPI_HXX
+#ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSAPI_HXX
+#define INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSAPI_HXX
 
 //
 // this is a collection of several functions to make dealing with the XForms
author	Thomas Arnhold <thomas@arnhold.org>	2013-10-23 19:30:56 +0200
committer	Thomas Arnhold <thomas@arnhold.org>	2013-10-23 23:22:32 +0200
commit	a45953ed7c69a33dbe6609e85770b29da29a2167 (patch)
tree	9239d88c1decc6cba9b7f3584284e0650eb7391f /xmloff
parent	9e775eee3ec964806209656509446b7e1bb92063 (diff)