fixincludeguards.sh: filter

Change-Id: Ifdb49a0fd5f658056b14b7c2f4e323dd38b412e6

74 files changed, 175 insertions, 175 deletions

diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index 2a6510d72734..743bf9db1b88 100644
--- a/filter/source/config/cache/basecontainer.hxx
+++ b/filter/source/config/cache/basecontainer.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 __FILTER_CONFIG_BASECONTAINER_HXX_
-#define __FILTER_CONFIG_BASECONTAINER_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_BASECONTAINER_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_BASECONTAINER_HXX
 
 #include "filtercache.hxx"
 #include <com/sun/star/uno/Exception.hpp>
@@ -296,6 +296,6 @@ class BaseContainer : public BaseLock
     } // namespace config
 } // namespace filter
 
-#endif // __FILTER_CONFIG_BASECONTAINER_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_BASECONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index 1dcfcbc154ee..8480e516404c 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FILTER_CONFIG_CACHEITEM_HXX_
-#define __FILTER_CONFIG_CACHEITEM_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX
 
 #include <boost/unordered_map.hpp>
 #include <deque>
@@ -228,6 +228,6 @@ typedef ::std::list< FlatDetectionInfo > FlatDetection;
     } // namespace config
 } // namespace filter
 
-#endif // __FILTER_CONFIG_CACHEITEM_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx
index 35fcb4d25565..bd0f34dd16ef 100644
--- a/filter/source/config/cache/cacheupdatelistener.hxx
+++ b/filter/source/config/cache/cacheupdatelistener.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 __FILTER_CONFIG_CACHEUPDATELISTENER_HXX_
-#define __FILTER_CONFIG_CACHEUPDATELISTENER_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEUPDATELISTENER_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEUPDATELISTENER_HXX
 
 #include "filtercache.hxx"
 #include <com/sun/star/lang/XEventListener.hpp>
@@ -120,6 +120,6 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante
     } // namespace config
 } // namespace filter
 
-#endif // __FILTER_CONFIG_CACHEUPDATELISTENER_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEUPDATELISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx
index a7381493ba85..664d979fb608 100644
--- a/filter/source/config/cache/configflush.hxx
+++ b/filter/source/config/cache/configflush.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 __FILTER_CONFIG_CONFIGFLUSH_HXX_
-#define __FILTER_CONFIG_CONFIGFLUSH_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONFIGFLUSH_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONFIGFLUSH_HXX
 
 #include "cacheitem.hxx"
 #include <com/sun/star/util/XRefreshable.hpp>
@@ -110,6 +110,6 @@ class ConfigFlush : public BaseLock
     } // namespace config
 } // namespace filter
 
-#endif // __FILTER_CONFIG_CONFIGFLUSH_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONFIGFLUSH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx
index 2061ae200dc0..1cab3ce6c775 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.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 _FILTER_CONFIG_CONSTANT_HXX_
-#define _FILTER_CONFIG_CONSTANT_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONSTANT_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONSTANT_HXX
 
 #include "macros.hxx"
 
@@ -181,6 +181,6 @@
 #define  QUERY_PARAM_DEFAULTFIRST                   _FILTER_CONFIG_FROM_ASCII_("default_first")
 #define  QUERY_CONSTVALUE_ALL                       _FILTER_CONFIG_FROM_ASCII_("all")
 
-#endif // _FILTER_CONFIG_CONSTANT_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONSTANT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx
index 22ed773898ef..aaf300c64bd6 100644
--- a/filter/source/config/cache/contenthandlerfactory.hxx
+++ b/filter/source/config/cache/contenthandlerfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FILTER_CONFIG_CONTENTHANDLERFACTORY_HXX_
-#define __FILTER_CONFIG_CONTENTHANDLERFACTORY_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONTENTHANDLERFACTORY_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONTENTHANDLERFACTORY_HXX
 
 #include "basecontainer.hxx"
 #include <com/sun/star/frame/XLoaderFactory.hpp>
@@ -151,6 +151,6 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain
     } // namespace config
 } // namespace filter
 
-#endif // __FILTER_CONFIG_CONTENTHANDLERFACTORY_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CONTENTHANDLERFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index e1f2a8c77f81..591b24331ef0 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FILTER_CONFIG_FILTERCACHE_HXX_
-#define __FILTER_CONFIG_FILTERCACHE_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FILTERCACHE_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FILTERCACHE_HXX
 
 #include "cacheitem.hxx"
 #include <com/sun/star/uno/Exception.hpp>
@@ -1041,6 +1041,6 @@ class FilterCache : public BaseLock
     } // namespace config
 } // namespace filter
 
-#endif // __FILTER_CONFIG_FILTERCACHE_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FILTERCACHE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx
index 9d4697732ae9..befb2052f804 100644
--- a/filter/source/config/cache/filterfactory.hxx
+++ b/filter/source/config/cache/filterfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FILTER_CONFIG_FILTERFACTORY_HXX_
-#define __FILTER_CONFIG_FILTERFACTORY_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FILTERFACTORY_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FILTERFACTORY_HXX
 
 #include "basecontainer.hxx"
 #include "querytokenizer.hxx"
@@ -194,6 +194,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer
     } // namespace config
 } // namespace filter
 
-#endif // __FILTER_CONFIG_FILTERFACTORY_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FILTERFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx
index 96623511aa6f..dcf7135e62f4 100644
--- a/filter/source/config/cache/frameloaderfactory.hxx
+++ b/filter/source/config/cache/frameloaderfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FILTER_CONFIG_FRAMELOADERFACTORY_HXX_
-#define __FILTER_CONFIG_FRAMELOADERFACTORY_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FRAMELOADERFACTORY_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FRAMELOADERFACTORY_HXX
 
 #include "basecontainer.hxx"
 #include <com/sun/star/frame/XLoaderFactory.hpp>
@@ -149,6 +149,6 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer
     } // namespace config
 } // namespace filter
 
-#endif // __FILTER_CONFIG_FRAMELOADERFACTORY_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_FRAMELOADERFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/lateinitlistener.hxx b/filter/source/config/cache/lateinitlistener.hxx
index b2e49eb0c707..3d6bea78c244 100644
--- a/filter/source/config/cache/lateinitlistener.hxx
+++ b/filter/source/config/cache/lateinitlistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FILTER_CONFIG_LATEINITLISTENER_HXX_
-#define __FILTER_CONFIG_LATEINITLISTENER_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_LATEINITLISTENER_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_LATEINITLISTENER_HXX
 
 #include "cacheitem.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -103,6 +103,6 @@ class LateInitListener : public BaseLock // must be the first one to guarantee r
     } // namespace config
 } // namespace filter
 
-#endif // __FILTER_CONFIG_LATEINITLISTENER_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_LATEINITLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/macros.hxx b/filter/source/config/cache/macros.hxx
index 4c7c84a9bfc2..fe580eb67eb8 100644
--- a/filter/source/config/cache/macros.hxx
+++ b/filter/source/config/cache/macros.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILTER_CONFIG_MACROS_HXX_
-#define _FILTER_CONFIG_MACROS_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_MACROS_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_MACROS_HXX
 
 //_______________________________________________
 
@@ -42,6 +42,6 @@
 #define _FILTER_CONFIG_LOG_1_(FORMAT, ARG1)
 #define _FILTER_CONFIG_LOG_2_(FORMAT, ARG1, ARG2)
 
-#endif // _FILTER_CONFIG_MACROS_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_MACROS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx
index b1ef32642e35..23db8ee5a9ef 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILTER_CONFIG_QUERYTOKENIZER_HXX_
-#define _FILTER_CONFIG_QUERYTOKENIZER_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_QUERYTOKENIZER_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_QUERYTOKENIZER_HXX
 
 #include <boost/unordered_map.hpp>
 #include <rtl/ustring.hxx>
@@ -97,6 +97,6 @@ class QueryTokenizer : public ::boost::unordered_map< OUString
     } // namespace config
 } // namespace filter
 
-#endif // _FILTER_CONFIG_QUERYTOKENIZER_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_QUERYTOKENIZER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index f885e60eff85..f7f75dbfd38a 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.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 __FILTER_CONFIG_TYPEDETECTION_HXX_
-#define __FILTER_CONFIG_TYPEDETECTION_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_TYPEDETECTION_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_TYPEDETECTION_HXX
 
 #include "basecontainer.hxx"
 #include <com/sun/star/document/XTypeDetection.hpp>
@@ -381,6 +381,6 @@ public:
 
 }}
 
-#endif // __FILTER_CONFIG_TYPEDETECTION_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_TYPEDETECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/versions.hxx b/filter/source/config/cache/versions.hxx
index 18bea02ea221..8adf7ca143ea 100644
--- a/filter/source/config/cache/versions.hxx
+++ b/filter/source/config/cache/versions.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILTER_CONFIG_VERSIONS_HXX_
-#define _FILTER_CONFIG_VERSIONS_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX
+#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX
 
 //_______________________________________________
 
 #define _FILTER_CONFIG_MIGRATION_Q_     // useful for migration time, to support some old functionality temp. :-)
 
-#endif // _FILTER_CONFIG_VERSIONS_HXX_
+#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx
index a76c98c60809..cc3fe05cb36d 100644
--- a/filter/source/flash/impswfdialog.hxx
+++ b/filter/source/flash/impswfdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef IMPSWFDIALOG_HXX
-#define IMPSWFDIALOG_HXX
+#ifndef INCLUDED_FILTER_SOURCE_FLASH_IMPSWFDIALOG_HXX
+#define INCLUDED_FILTER_SOURCE_FLASH_IMPSWFDIALOG_HXX
 
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -74,6 +74,6 @@ public:
     com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetFilterData();
 };
 
-#endif // IMPDIALOG_HXX
+#endif // INCLUDED_FILTER_SOURCE_FLASH_IMPSWFDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx
index 86c08642d229..a74559e951a3 100644
--- a/filter/source/flash/swfdialog.hxx
+++ b/filter/source/flash/swfdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SWFDIALOG_HXX
-#define SWFDIALOG_HXX
+#ifndef INCLUDED_FILTER_SOURCE_FLASH_SWFDIALOG_HXX
+#define INCLUDED_FILTER_SOURCE_FLASH_SWFDIALOG_HXX
 
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/document/XExporter.hpp>
diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx
index 5ded6ea8ca47..3c9cb7951821 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.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 _FLASH_EXPORTER_HXX
-#define _FLASH_EXPORTER_HXX
+#ifndef INCLUDED_FILTER_SOURCE_FLASH_SWFEXPORTER_HXX
+#define INCLUDED_FILTER_SOURCE_FLASH_SWFEXPORTER_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index e615c4d75ad2..ef887ac1468e 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SWF_WRITER_HXX_
-#define _SWF_WRITER_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_FLASH_SWFWRITER_HXX
+#define INCLUDED_FILTER_SOURCE_FLASH_SWFWRITER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/io/XOutputStream.hpp>
diff --git a/filter/source/graphic/GraphicExportDialog.hxx b/filter/source/graphic/GraphicExportDialog.hxx
index 7a32708d7089..7933f3c07b34 100644
--- a/filter/source/graphic/GraphicExportDialog.hxx
+++ b/filter/source/graphic/GraphicExportDialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GRAPHICEXPORTDIALOG_HXX_
-#define _GRAPHICEXPORTDIALOG_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHIC_GRAPHICEXPORTDIALOG_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHIC_GRAPHICEXPORTDIALOG_HXX
 
 #include <tools/fldunit.hxx>
 #include <cppuhelper/implbase4.hxx>
diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx
index 13e9b39b317a..4c4c7d90300d 100644
--- a/filter/source/graphic/GraphicExportFilter.hxx
+++ b/filter/source/graphic/GraphicExportFilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GRAPHICEXPORTFILTER_HXX_
-#define _GRAPHICEXPORTFILTER_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHIC_GRAPHICEXPORTFILTER_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHIC_GRAPHICEXPORTFILTER_HXX
 
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/document/XFilter.hpp>
diff --git a/filter/source/graphicfilter/egif/giflzwc.hxx b/filter/source/graphicfilter/egif/giflzwc.hxx
index c9005e7941a7..35b40305564f 100644
--- a/filter/source/graphicfilter/egif/giflzwc.hxx
+++ b/filter/source/graphicfilter/egif/giflzwc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GIFLZWC_HXX
-#define _GIFLZWC_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX
 
 #include <vcl/bmpacc.hxx>
 
@@ -52,6 +52,6 @@ public:
     void                        EndCompression();
 };
 
-#endif // _GIFLZWC_HXX
+#endif // INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx
index 65af1e96b507..3a5e3f82cbd5 100644
--- a/filter/source/graphicfilter/icgm/bitmap.hxx
+++ b/filter/source/graphicfilter/icgm/bitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CGM_BITMAP_HXX_
-#define CGM_BITMAP_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_BITMAP_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_BITMAP_HXX
 
 #include "cgm.hxx"
 #include <vcl/bmpacc.hxx>
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx
index 6674368b512e..81a1f636d40a 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CGM_BUNDLES_HXX_
-#define CGM_BUNDLES_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_BUNDLES_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_BUNDLES_HXX
 
 #include <sal/types.h>
 #include "cgmtypes.hxx"
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index 2ad26ec8f144..84523e3c59ee 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CGM_HXX_
-#define CGM_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CGM_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CGM_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 
diff --git a/filter/source/graphicfilter/icgm/cgmtypes.hxx b/filter/source/graphicfilter/icgm/cgmtypes.hxx
index b6c6e3716682..b5e678acc2f5 100644
--- a/filter/source/graphicfilter/icgm/cgmtypes.hxx
+++ b/filter/source/graphicfilter/icgm/cgmtypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CGM_TYPES_HXX_
-#define CGM_TYPES_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CGMTYPES_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CGMTYPES_HXX
 
 struct FloatPoint
 {
diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx
index b7dd7f8d524c..ca8c190df003 100644
--- a/filter/source/graphicfilter/icgm/chart.hxx
+++ b/filter/source/graphicfilter/icgm/chart.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CGM_CHART_HXX_
-#define CGM_CHART_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CHART_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_CHART_HXX
 
 /* FILE TYPE CONSTANTS: */
 #define NOCHART         0       /* Undefined chart.         */
diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx
index 26208b593963..6a215eff65fb 100644
--- a/filter/source/graphicfilter/icgm/elements.hxx
+++ b/filter/source/graphicfilter/icgm/elements.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 CGM_ELEMENTS_HXX_
-#define CGM_ELEMENTS_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_ELEMENTS_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_ELEMENTS_HXX
 
 #include "main.hxx"
 #include "cgmtypes.hxx"
diff --git a/filter/source/graphicfilter/icgm/main.hxx b/filter/source/graphicfilter/icgm/main.hxx
index c97ea6cbc060..d213b002a191 100644
--- a/filter/source/graphicfilter/icgm/main.hxx
+++ b/filter/source/graphicfilter/icgm/main.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CGM_MAIN_HXX
-#define CGM_MAIN_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_MAIN_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_MAIN_HXX
 
 #include "cgm.hxx"
 
diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx
index d6a67da176fb..193c4c890a94 100644
--- a/filter/source/graphicfilter/icgm/outact.hxx
+++ b/filter/source/graphicfilter/icgm/outact.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CGM_OUTACT_HXX_
-#define CGM_OUTACT_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_OUTACT_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_OUTACT_HXX
 
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
index 0a5657276b86..518ed28e4233 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXF2MTF_HXX
-#define _DXF2MTF_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXF2MTF_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXF2MTF_HXX
 
 #include "dxfreprd.hxx"
 #include <vcl/font.hxx>
diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.hxx b/filter/source/graphicfilter/idxf/dxfblkrd.hxx
index 84d38e601c04..1fe856f11ea2 100644
--- a/filter/source/graphicfilter/idxf/dxfblkrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfblkrd.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXFBLKRD_HXX
-#define _DXFBLKRD_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFBLKRD_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFBLKRD_HXX
 
 #include <dxfentrd.hxx>
 
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx
index 3439b228cae0..fc2aacabd808 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXFENTRD_HXX
-#define _DXFENTRD_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFENTRD_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFENTRD_HXX
 
 #include <dxfgrprd.hxx>
 #include <dxfvec.hxx>
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
index 0d16edbf69ef..6864e994ebfc 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXFGRPRD_HXX
-#define _DXFGRPRD_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFGRPRD_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFGRPRD_HXX
 
 #include <sal/types.h>
 
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.hxx b/filter/source/graphicfilter/idxf/dxfreprd.hxx
index c2c06eec3ec7..6e420069de2a 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXFREPRD_HXX
-#define _DXFREPRD_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFREPRD_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFREPRD_HXX
 
 #include <dxfblkrd.hxx>
 #include <dxftblrd.hxx>
diff --git a/filter/source/graphicfilter/idxf/dxftblrd.hxx b/filter/source/graphicfilter/idxf/dxftblrd.hxx
index 0b129398f840..3cf0ec7bb155 100644
--- a/filter/source/graphicfilter/idxf/dxftblrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxftblrd.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXFTBLRD_HXX
-#define _DXFTBLRD_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFTBLRD_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFTBLRD_HXX
 
 #include <dxfgrprd.hxx>
 #include <dxfvec.hxx>
diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx
index 3db285f7d628..be505992a255 100644
--- a/filter/source/graphicfilter/idxf/dxfvec.hxx
+++ b/filter/source/graphicfilter/idxf/dxfvec.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXFVEC_HXX
-#define _DXFVEC_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFVEC_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_IDXF_DXFVEC_HXX
 
 #include <sal/types.h>
 #include <vcl/lineinfo.hxx>
diff --git a/filter/source/graphicfilter/itiff/ccidecom.hxx b/filter/source/graphicfilter/itiff/ccidecom.hxx
index bdc12f542586..efd2d6d23e62 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.hxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CCIDECOM_HXX
-#define _CCIDECOM_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_CCIDECOM_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_CCIDECOM_HXX
 
 #include <tools/stream.hxx>
 
diff --git a/filter/source/graphicfilter/itiff/lzwdecom.hxx b/filter/source/graphicfilter/itiff/lzwdecom.hxx
index 9edfc575b54e..a5afdcafd121 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.hxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _LZWDECOM_HXX
-#define _LZWDECOM_HXX
+#ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_LZWDECOM_HXX
+#define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ITIFF_LZWDECOM_HXX
 
 #include <tools/stream.hxx>
 
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index d5b2bc6e255e..f01128533318 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.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 _ESCHESDO_HXX
-#define _ESCHESDO_HXX
+#ifndef INCLUDED_FILTER_SOURCE_MSFILTER_ESCHESDO_HXX
+#define INCLUDED_FILTER_SOURCE_MSFILTER_ESCHESDO_HXX
 #include <filter/msfilter/escherex.hxx>
 #include <svx/unopage.hxx>
 #include <vcl/mapmod.hxx>
@@ -197,6 +197,6 @@ public:
 
 
 
-#endif // _ESCHESDO_HXX
+#endif // INCLUDED_FILTER_SOURCE_MSFILTER_ESCHESDO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 7df190b490f7..808b31495dde 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef IMPDIALOG_HXX
-#define IMPDIALOG_HXX
+#ifndef INCLUDED_FILTER_SOURCE_PDF_IMPDIALOG_HXX
+#define INCLUDED_FILTER_SOURCE_PDF_IMPDIALOG_HXX
 
 #include "pdffilter.hxx"
 
@@ -440,7 +440,7 @@ public:
     void    SetFilterConfigItem( const ImpPDFTabDialog* paParent );
 };
 
-#endif // IMPDIALOG_HXX
+#endif // INCLUDED_FILTER_SOURCE_PDF_IMPDIALOG_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index 23504bee589f..aff530d1c846 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef PDFDIALOG_HXX
-#define PDFDIALOG_HXX
+#ifndef INCLUDED_FILTER_SOURCE_PDF_PDFDIALOG_HXX
+#define INCLUDED_FILTER_SOURCE_PDF_PDFDIALOG_HXX
 
 #include "pdffilter.hxx"
 #include <svtools/genericunodialog.hxx>
@@ -79,6 +79,6 @@ Sequence< sal_Int8 > SAL_CALL PDFDialog_getImplementationId() throw(RuntimeExcep
 Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames() throw (RuntimeException);
 Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
 
-#endif // PDFDIALOG_HXX
+#endif // INCLUDED_FILTER_SOURCE_PDF_PDFDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx
index e76c0b13d3b1..8db104da05c5 100644
--- a/filter/source/pdf/pdfexport.hxx
+++ b/filter/source/pdf/pdfexport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef PDFEXPORT_HXX
-#define PDFEXPORT_HXX
+#ifndef INCLUDED_FILTER_SOURCE_PDF_PDFEXPORT_HXX
+#define INCLUDED_FILTER_SOURCE_PDF_PDFEXPORT_HXX
 
 #include "pdffilter.hxx"
 #include <tools/multisel.hxx>
diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx
index 33eeeca08c13..31741883d006 100644
--- a/filter/source/pdf/pdffilter.hxx
+++ b/filter/source/pdf/pdffilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef PDFFILTER_HXX
-#define PDFFILTER_HXX
+#ifndef INCLUDED_FILTER_SOURCE_PDF_PDFFILTER_HXX
+#define INCLUDED_FILTER_SOURCE_PDF_PDFFILTER_HXX
 
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XExporter.hpp>
@@ -112,7 +112,7 @@ Reference< XInterface >
 SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
     throw ( Exception );
 
-#endif // PDFFILTER_HXX
+#endif // INCLUDED_FILTER_SOURCE_PDF_PDFFILTER_HXX
 
 
 
diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx
index ea24a94b4bef..f26e2559deb5 100644
--- a/filter/source/pdf/pdfinteract.hxx
+++ b/filter/source/pdf/pdfinteract.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef PDFINTERACT_HXX
-#define PDFINTERACT_HXX
+#ifndef INCLUDED_FILTER_SOURCE_PDF_PDFINTERACT_HXX
+#define INCLUDED_FILTER_SOURCE_PDF_PDFINTERACT_HXX
 
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "cppuhelper/implbase2.hxx"
@@ -75,6 +75,6 @@ Reference< XInterface >
 SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
     throw ( Exception );
 
-#endif // PDFINTERACT_HXX
+#endif // INCLUDED_FILTER_SOURCE_PDF_PDFINTERACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/placeware/exporter.hxx b/filter/source/placeware/exporter.hxx
index 20c49303ca21..4cf8b9350dac 100644
--- a/filter/source/placeware/exporter.hxx
+++ b/filter/source/placeware/exporter.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 _PLACEWARE_EXPORTER_HXX
-#define _PLACEWARE_EXPORTER_HXX
+#ifndef INCLUDED_FILTER_SOURCE_PLACEWARE_EXPORTER_HXX
+#define INCLUDED_FILTER_SOURCE_PLACEWARE_EXPORTER_HXX
 
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XGraphicExportFilter.hpp>
diff --git a/filter/source/placeware/tempfile.hxx b/filter/source/placeware/tempfile.hxx
index 4b3702466e31..ceefca9a3ff6 100644
--- a/filter/source/placeware/tempfile.hxx
+++ b/filter/source/placeware/tempfile.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PLACEWARE_TEMPFILE_HXX_
-#define _PLACEWARE_TEMPFILE_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_PLACEWARE_TEMPFILE_HXX
+#define INCLUDED_FILTER_SOURCE_PLACEWARE_TEMPFILE_HXX
 
 #include <osl/file.hxx>
 #include <rtl/ustring.hxx>
diff --git a/filter/source/svg/b2dellipse.hxx b/filter/source/svg/b2dellipse.hxx
index 34b2054eb517..21c1937da982 100644
--- a/filter/source/svg/b2dellipse.hxx
+++ b/filter/source/svg/b2dellipse.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef _BASEGFX_B2DELLIPSE_HXX
-#define _BASEGFX_B2DELLIPSE_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_B2DELLIPSE_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_B2DELLIPSE_HXX
 
 #include <sal/types.h>
 
@@ -50,6 +50,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BASEGFX_B2DELLIPSE_HXX */
+#endif // INCLUDED_FILTER_SOURCE_SVG_B2DELLIPSE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
index 2aec0ef9e255..33cbe7fd31bc 100644
--- a/filter/source/svg/gfxtypes.hxx
+++ b/filter/source/svg/gfxtypes.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_GFXTYPES_HXX
-#define INCLUDED_GFXTYPES_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_GFXTYPES_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_GFXTYPES_HXX
 
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx
index bc005f2ec513..86564f850ec3 100644
--- a/filter/source/svg/impsvgdialog.hxx
+++ b/filter/source/svg/impsvgdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef IMPSVGDIALOG_HXX
-#define IMPSVGDIALOG_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_IMPSVGDIALOG_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_IMPSVGDIALOG_HXX
 
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -71,6 +71,6 @@ public:
     com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetFilterData();
 };
 
-#endif // IMPSVGDIALOG_HXX
+#endif // INCLUDED_FILTER_SOURCE_SVG_IMPSVGDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/parserfragments.hxx b/filter/source/svg/parserfragments.hxx
index ac8f2ec4a474..6d4c3522a140 100644
--- a/filter/source/svg/parserfragments.hxx
+++ b/filter/source/svg/parserfragments.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_PARSERFRAGMENTS_HXX
-#define INCLUDED_PARSERFRAGMENTS_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_PARSERFRAGMENTS_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_PARSERFRAGMENTS_HXX
 
 #include <sal/config.h>
 #include <vector>
diff --git a/filter/source/svg/spirit_supplements.hxx b/filter/source/svg/spirit_supplements.hxx
index 41b5ca6b8c2b..1ed60ec232e2 100644
--- a/filter/source/svg/spirit_supplements.hxx
+++ b/filter/source/svg/spirit_supplements.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_SPIRIT_SUPPLEMENTS_HXX
-#define INCLUDED_SPIRIT_SUPPLEMENTS_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_SPIRIT_SUPPLEMENTS_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_SPIRIT_SUPPLEMENTS_HXX
 
 # ifndef USE_MODERN_SPIRIT
 # include <boost/spirit.hpp>
diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx
index b2ba26baffd5..c426065ead46 100644
--- a/filter/source/svg/svgdialog.hxx
+++ b/filter/source/svg/svgdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVGDIALOG_HXX
-#define SVGDIALOG_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_SVGDIALOG_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_SVGDIALOG_HXX
 
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/document/XExporter.hpp>
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 814a1d35c6e9..c4d133b0f785 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVGFILTER_HXX
-#define SVGFILTER_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_SVGFILTER_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_SVGFILTER_HXX
 
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/animations/XAnimationNodeSupplier.hpp>
@@ -328,6 +328,6 @@ public:
     virtual    ~SVGFilter();
 };
 
-#endif // SVGFILTER_HXX
+#endif // INCLUDED_FILTER_SOURCE_SVG_SVGFILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx
index 364af363ecb1..b200e89559af 100644
--- a/filter/source/svg/svgfontexport.hxx
+++ b/filter/source/svg/svgfontexport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVGFONTEXPORT_HXX
-#define SVGFONTEXPORT_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_SVGFONTEXPORT_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_SVGFONTEXPORT_HXX
 
 #include <comphelper/stl_types.hxx>
 #include <tools/fontenum.hxx>
diff --git a/filter/source/svg/svgreader.hxx b/filter/source/svg/svgreader.hxx
index ec650ea0cf2a..04b63c0ee9ca 100644
--- a/filter/source/svg/svgreader.hxx
+++ b/filter/source/svg/svgreader.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_SVGREADER_HXX
-#define INCLUDED_SVGREADER_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_SVGREADER_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_SVGREADER_HXX
 
 #include <filter/dllapi.h>
 
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 08ca0a3539f6..85ec20ecd73e 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVGWRITER_HXX
-#define SVGWRITER_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX
 
 #include <stack>
 #include <cppuhelper/implbase1.hxx>
diff --git a/filter/source/svg/test/odfserializer.hxx b/filter/source/svg/test/odfserializer.hxx
index 5fd59f6cb4b4..cda1b9e59e89 100644
--- a/filter/source/svg/test/odfserializer.hxx
+++ b/filter/source/svg/test/odfserializer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVG_ODFSERIALIZER_HXX
-#define INCLUDED_SVG_ODFSERIALIZER_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_TEST_ODFSERIALIZER_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_TEST_ODFSERIALIZER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
diff --git a/filter/source/svg/tokenmap.hxx b/filter/source/svg/tokenmap.hxx
index d6f7592363b8..5969fecd0ce7 100644
--- a/filter/source/svg/tokenmap.hxx
+++ b/filter/source/svg/tokenmap.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_TOKENMAP_HXX
-#define INCLUDED_TOKENMAP_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_TOKENMAP_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_TOKENMAP_HXX
 
 #include "tokens.hxx"
 
diff --git a/filter/source/svg/units.hxx b/filter/source/svg/units.hxx
index a7eb40a02417..84697e0b1f78 100644
--- a/filter/source/svg/units.hxx
+++ b/filter/source/svg/units.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_UNITS_HXX
-#define INCLUDED_UNITS_HXX
+#ifndef INCLUDED_FILTER_SOURCE_SVG_UNITS_HXX
+#define INCLUDED_FILTER_SOURCE_SVG_UNITS_HXX
 
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index a583b40cb70d..d31a78b766f9 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _T602FILTER_HXX
-#define _T602FILTER_HXX
+#ifndef INCLUDED_FILTER_SOURCE_T602_T602FILTER_HXX
+#define INCLUDED_FILTER_SOURCE_T602_T602FILTER_HXX
 
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx
index c01398409213..97f66b582123 100644
--- a/filter/source/textfilterdetect/filterdetect.hxx
+++ b/filter/source/textfilterdetect/filterdetect.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FILTER_TEXTFILTERDETECT_FILTERDETECT_HXX__
-#define __FILTER_TEXTFILTERDETECT_FILTERDETECT_HXX__
+#ifndef INCLUDED_FILTER_SOURCE_TEXTFILTERDETECT_FILTERDETECT_HXX
+#define INCLUDED_FILTER_SOURCE_TEXTFILTERDETECT_FILTERDETECT_HXX
 
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
index 4ffaf0f79b99..d5d4c5a6f9f0 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLFILTERADAPTOR_HXX
-#define _XMLFILTERADAPTOR_HXX
+#ifndef INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_XMLFILTERADAPTOR_HXX
+#define INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_XMLFILTERADAPTOR_HXX
 
 
 #include <com/sun/star/document/XFilter.hpp>
diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx
index 2424ea24bfb2..1642845421d6 100644
--- a/filter/source/xmlfilteradaptor/streamwrap.hxx
+++ b/filter/source/xmlfilteradaptor/streamwrap.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 _OSL_FILE_WRAPPER_HXX_
-#define _OSL_FILE_WRAPPER_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX
+#define INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/io/XOutputStream.hpp>
@@ -56,6 +56,6 @@ public:
 }   // namespace utl
 
 
-#endif // _UTL_STREAM_WRAPPER_HXX_
+#endif // INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/xsltdialog/typedetectionexport.hxx b/filter/source/xsltdialog/typedetectionexport.hxx
index fe9435da8123..ebee7f0dba46 100644
--- a/filter/source/xsltdialog/typedetectionexport.hxx
+++ b/filter/source/xsltdialog/typedetectionexport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TYPEDETECTION_EXPORT_HXX
-#define _TYPEDETECTION_EXPORT_HXX
+#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_TYPEDETECTIONEXPORT_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_TYPEDETECTIONEXPORT_HXX
 
 #include <com/sun/star/xml/sax/XWriter.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx
index 24bcdf0245f9..c4a138fd73f0 100644
--- a/filter/source/xsltdialog/typedetectionimport.hxx
+++ b/filter/source/xsltdialog/typedetectionimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TYPEDETECTION_IMPORT_HXX
-#define _TYPEDETECTION_IMPORT_HXX
+#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_TYPEDETECTIONIMPORT_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_TYPEDETECTIONIMPORT_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx
index 00a354befbae..af2e6f77c984 100644
--- a/filter/source/xsltdialog/xmlfiltercommon.hxx
+++ b/filter/source/xsltdialog/xmlfiltercommon.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 _XMLFILTERCOMMON_HXX_
-#define _XMLFILTERCOMMON_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERCOMMON_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERCOMMON_HXX
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx
index 7179f9d4e910..689e7470024e 100644
--- a/filter/source/xsltdialog/xmlfilterjar.hxx
+++ b/filter/source/xsltdialog/xmlfilterjar.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 _XMLFILTERJAR_HXX_
-#define _XMLFILTERJAR_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERJAR_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERJAR_HXX
 
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index bf3b1c457afb..60b99835a25a 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.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 _XMLFILTERSETTINGSDIALOG_HXX_
-#define _XMLFILTERSETTINGSDIALOG_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERSETTINGSDIALOG_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERSETTINGSDIALOG_HXX
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 563ad53314ab..726d857bf065 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.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 _XMLFILTERTABDIALOG_HXX_
-#define _XMLFILTERTABDIALOG_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTABDIALOG_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTABDIALOG_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/tabctrl.hxx>
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
index 8e45e360e3e2..dfb918c087b2 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.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 _XMLFILTERTABPAGEBASIC_HXX_
-#define _XMLFILTERTABPAGEBASIC_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTABPAGEBASIC_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTABPAGEBASIC_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
index 5bb3b2d220a5..efc7bfad38ab 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.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 _XMLFILTERTABPAGEXSLT_HXX_
-#define _XMLFILTERTABPAGEXSLT_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTABPAGEXSLT_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTABPAGEXSLT_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <sfx2/tabdlg.hxx>
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index fd1b2b9e7905..5b5613a0cc8a 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.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 _XMLFILTERTESTDIALOG_HXX_
-#define _XMLFILTERTESTDIALOG_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTESTDIALOG_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERTESTDIALOG_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx
index 024262648811..87d068f7353e 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.hxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __LIBXSLTTRANSFORMER_HXX__
-#define __LIBXSLTTRANSFORMER_HXX__
+#ifndef INCLUDED_FILTER_SOURCE_XSLTFILTER_LIBXSLTTRANSFORMER_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTFILTER_LIBXSLTTRANSFORMER_HXX
 
 #include <stdio.h>
 
@@ -188,5 +188,5 @@ namespace XSLT
 }
 ;
 
-#endif // __LIBXSLTTRANSFORMER_HXX__
+#endif // INCLUDED_FILTER_SOURCE_XSLTFILTER_LIBXSLTTRANSFORMER_HXX
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/xsltfilter/OleHandler.hxx b/filter/source/xsltfilter/OleHandler.hxx
index afd707651050..35ce9656bc02 100644
--- a/filter/source/xsltfilter/OleHandler.hxx
+++ b/filter/source/xsltfilter/OleHandler.hxx
@@ -8,8 +8,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OLEHANDLER_HXX_
-#define OLEHANDLER_HXX_
+#ifndef INCLUDED_FILTER_SOURCE_XSLTFILTER_OLEHANDLER_HXX
+#define INCLUDED_FILTER_SOURCE_XSLTFILTER_OLEHANDLER_HXX
 #include <cstdio>
 #include <cstring>
 #include <list>
@@ -87,4 +87,4 @@ namespace XSLT
 }
 
 
-#endif /* OLEHANDLER_HXX_ */
+#endif // INCLUDED_FILTER_SOURCE_XSLTFILTER_OLEHANDLER_HXX