fixincludeguards.sh: include/c*

Change-Id: Icba422d99836518a1b662b15144bc9334bed1473
author: Thomas Arnhold <thomas@arnhold.org> 2013-10-23 19:17:00 +0200
committer: Thomas Arnhold <thomas@arnhold.org> 2013-10-23 23:22:30 +0200
commit: 0bd7f12d41567842b1e31514e1d84340d90f5b42 (patch)
tree: d1140425ddbb62c4cf71634f2813f7e5dd7d88cb /include
parent: f20eef009438883ebc205c9cce3e4bac87256f29 (diff)
246 files changed, 648 insertions, 648 deletions
diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx
index 5c1376b0632b..307b78cf2078 100644
--- a/include/canvas/base/bitmapcanvasbase.hxx
+++ b/include/canvas/base/bitmapcanvasbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_BITMAPCANVASBASE_HXX
-#define INCLUDED_CANVAS_BITMAPCANVASBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_BITMAPCANVASBASE_HXX
+#define INCLUDED_CANVAS_BASE_BITMAPCANVASBASE_HXX
 
 #include <canvas/base/canvasbase.hxx>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -123,6 +123,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_BITMAPCANVASBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_BITMAPCANVASBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx
index 2713e0ea11bb..09a1590972be 100644
--- a/include/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/include/canvas/base/bufferedgraphicdevicebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX
-#define INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_BUFFEREDGRAPHICDEVICEBASE_HXX
+#define INCLUDED_CANVAS_BASE_BUFFEREDGRAPHICDEVICEBASE_HXX
 
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
@@ -271,6 +271,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_BUFFEREDGRAPHICDEVICEBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 8c7e1579f1e2..2a7407fc038f 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_CACHEDPRIMITIVEBASE_HXX
-#define INCLUDED_CANVAS_CACHEDPRIMITIVEBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_CACHEDPRIMITIVEBASE_HXX
+#define INCLUDED_CANVAS_BASE_CACHEDPRIMITIVEBASE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -112,6 +112,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_CACHEDPRIMITIVEBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_CACHEDPRIMITIVEBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 8f134d23289a..c40e5c5afbc5 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_CANVASBASE_HXX
-#define INCLUDED_CANVAS_CANVASBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_CANVASBASE_HXX
+#define INCLUDED_CANVAS_BASE_CANVASBASE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XCanvas.hpp>
@@ -469,6 +469,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_CANVASBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_CANVASBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx
index 7c1b5508bb4e..b6f6ac0c6c62 100644
--- a/include/canvas/base/canvascustomspritebase.hxx
+++ b/include/canvas/base/canvascustomspritebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_CANVASCUSTOMSPRITEBASE_HXX
-#define INCLUDED_CANVAS_CANVASCUSTOMSPRITEBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX
+#define INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/rendering/XCustomSprite.hpp>
@@ -266,6 +266,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_CANVASCUSTOMSPRITEBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx
index 2b2fd2d774d8..87fc8ff27134 100644
--- a/include/canvas/base/canvascustomspritehelper.hxx
+++ b/include/canvas/base/canvascustomspritehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_CANVASCUSTOMSPRITEHELPER_HXX
-#define INCLUDED_CANVAS_CANVASCUSTOMSPRITEHELPER_HXX
+#ifndef INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEHELPER_HXX
+#define INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
@@ -282,6 +282,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_CANVASCUSTOMSPRITEHELPER_HXX */
+#endif // INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/disambiguationhelper.hxx b/include/canvas/base/disambiguationhelper.hxx
index f12a61472cd4..2a19db1a9053 100644
--- a/include/canvas/base/disambiguationhelper.hxx
+++ b/include/canvas/base/disambiguationhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX
-#define INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX
+#ifndef INCLUDED_CANVAS_BASE_DISAMBIGUATIONHELPER_HXX
+#define INCLUDED_CANVAS_BASE_DISAMBIGUATIONHELPER_HXX
 
 #include <osl/mutex.hxx>
 
@@ -76,6 +76,6 @@ protected:
     };
 }
 
-#endif /* INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX */
+#endif // INCLUDED_CANVAS_BASE_DISAMBIGUATIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index fd36b3de6ac8..df8551fcdc31 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_GRAPHICDEVICEBASE_HXX
-#define INCLUDED_CANVAS_GRAPHICDEVICEBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX
+#define INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -378,6 +378,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_GRAPHICDEVICEBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index 602e18a09eb0..ee396c2429b8 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_INTEGERBITMAPBASE_HXX
-#define INCLUDED_CANVAS_INTEGERBITMAPBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_INTEGERBITMAPBASE_HXX
+#define INCLUDED_CANVAS_BASE_INTEGERBITMAPBASE_HXX
 
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <canvas/base/bitmapcanvasbase.hxx>
@@ -140,6 +140,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_INTEGERBITMAPBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_INTEGERBITMAPBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/sprite.hxx b/include/canvas/base/sprite.hxx
index 4ebafd57f998..b3ed7dba2340 100644
--- a/include/canvas/base/sprite.hxx
+++ b/include/canvas/base/sprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SPRITE_HXX
-#define INCLUDED_CANVAS_SPRITE_HXX
+#ifndef INCLUDED_CANVAS_BASE_SPRITE_HXX
+#define INCLUDED_CANVAS_BASE_SPRITE_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -111,6 +111,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_SPRITE_HXX */
+#endif // INCLUDED_CANVAS_BASE_SPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx
index f892bf4170a7..f536a2383fda 100644
--- a/include/canvas/base/spritecanvasbase.hxx
+++ b/include/canvas/base/spritecanvasbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SPRITECANVASBASE_HXX
-#define INCLUDED_CANVAS_SPRITECANVASBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_SPRITECANVASBASE_HXX
+#define INCLUDED_CANVAS_BASE_SPRITECANVASBASE_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
@@ -188,6 +188,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_SPRITECANVASBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_SPRITECANVASBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/spritesurface.hxx b/include/canvas/base/spritesurface.hxx
index 47a0fb24a67d..40a8f799b5c4 100644
--- a/include/canvas/base/spritesurface.hxx
+++ b/include/canvas/base/spritesurface.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SPRITESURFACE_HXX
-#define INCLUDED_CANVAS_SPRITESURFACE_HXX
+#ifndef INCLUDED_CANVAS_BASE_SPRITESURFACE_HXX
+#define INCLUDED_CANVAS_BASE_SPRITESURFACE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -65,6 +65,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_SPRITESURFACE_HXX */
+#endif // INCLUDED_CANVAS_BASE_SPRITESURFACE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/canvastoolsdllapi.h b/include/canvas/canvastoolsdllapi.h
index ad96dec3ea7c..f8a6ad6598a7 100644
--- a/include/canvas/canvastoolsdllapi.h
+++ b/include/canvas/canvastoolsdllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CANVAS_DLLAPI_H
-#define _CANVAS_DLLAPI_H
+#ifndef INCLUDED_CANVAS_CANVASTOOLSDLLAPI_H
+#define INCLUDED_CANVAS_CANVASTOOLSDLLAPI_H
 
 #include "sal/config.h"
 #include "sal/types.h"
diff --git a/include/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx
index 295057bd832b..c31c0d826cd1 100644
--- a/include/canvas/rendering/bitmap.hxx
+++ b/include/canvas/rendering/bitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_BITMAP_HXX
-#define INCLUDED_CANVAS_BITMAP_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_BITMAP_HXX
+#define INCLUDED_CANVAS_RENDERING_BITMAP_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XCanvas.hpp>
@@ -309,6 +309,6 @@ namespace canvas
     typedef ::boost::shared_ptr< Bitmap > BitmapSharedPtr;
 }
 
-#endif /* INCLUDED_CANVAS_BITMAP_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_BITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx
index f15fed3e72e8..8df4cc94a136 100644
--- a/include/canvas/rendering/icachedprimitive.hxx
+++ b/include/canvas/rendering/icachedprimitive.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_ICACHEDPRIMITIVE_HXX
-#define INCLUDED_CANVAS_ICACHEDPRIMITIVE_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
+#define INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
 
 #include <sal/types.h>
 
@@ -55,6 +55,6 @@ namespace canvas
     typedef ::boost::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr;
 }
 
-#endif /* INCLUDED_CANVAS_ICACHEDPRIMITIVE_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx
index 4226a9a6d759..a9922bead33e 100644
--- a/include/canvas/rendering/icolorbuffer.hxx
+++ b/include/canvas/rendering/icolorbuffer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_ICOLORBUFFER_HXX
-#define INCLUDED_CANVAS_ICOLORBUFFER_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
+#define INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
 
 #include <sal/types.h>
 
@@ -83,6 +83,6 @@ namespace canvas
     typedef ::boost::shared_ptr< IColorBuffer > IColorBufferSharedPtr;
 }
 
-#endif /* INCLUDED_CANVAS_ICOLORBUFFER_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/irendermodule.hxx b/include/canvas/rendering/irendermodule.hxx
index 413320eb85e9..6484d0b8c10c 100644
--- a/include/canvas/rendering/irendermodule.hxx
+++ b/include/canvas/rendering/irendermodule.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_IRENDERMODULE_HXX
-#define INCLUDED_CANVAS_IRENDERMODULE_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
+#define INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
 
 #include <sal/types.h>
 
@@ -138,6 +138,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_IRENDERMODULE_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/isurface.hxx b/include/canvas/rendering/isurface.hxx
index a79faf96a8c8..1e8e47a5578b 100644
--- a/include/canvas/rendering/isurface.hxx
+++ b/include/canvas/rendering/isurface.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_ISURFACE_HXX
-#define INCLUDED_CANVAS_ISURFACE_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
+#define INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
 
 #include <sal/types.h>
 
@@ -77,6 +77,6 @@ namespace canvas
     typedef ::boost::shared_ptr< ISurface > ISurfaceSharedPtr;
 }
 
-#endif /* INCLUDED_CANVAS_ISURFACE_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/isurfaceproxy.hxx b/include/canvas/rendering/isurfaceproxy.hxx
index f8db605a38d3..47a2e98b3d94 100644
--- a/include/canvas/rendering/isurfaceproxy.hxx
+++ b/include/canvas/rendering/isurfaceproxy.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_ISURFACEPROXY_HXX
-#define INCLUDED_CANVAS_ISURFACEPROXY_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
+#define INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
 
 #include <canvas/rendering/irendermodule.hxx>
 
@@ -102,6 +102,6 @@ namespace canvas
     typedef ::boost::shared_ptr< ISurfaceProxy > ISurfaceProxySharedPtr;
 }
 
-#endif /* INCLUDED_CANVAS_ISURFACEPROXY_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/isurfaceproxymanager.hxx b/include/canvas/rendering/isurfaceproxymanager.hxx
index 98c7795a293e..7172748f8531 100644
--- a/include/canvas/rendering/isurfaceproxymanager.hxx
+++ b/include/canvas/rendering/isurfaceproxymanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX
-#define INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_ISURFACEPROXYMANAGER_HXX
+#define INCLUDED_CANVAS_RENDERING_ISURFACEPROXYMANAGER_HXX
 
 #include <canvas/rendering/irendermodule.hxx>
 #include <canvas/rendering/icolorbuffer.hxx>
@@ -69,6 +69,6 @@ namespace canvas
     CANVASTOOLS_DLLPUBLIC ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule );
 }
 
-#endif /* INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_ISURFACEPROXYMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index 7be6017fa264..51acf8765fd8 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -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 _COM_SUN_STAR_UNO_ANY_H_
-#define _COM_SUN_STAR_UNO_ANY_H_
+#ifndef INCLUDED_COM_SUN_STAR_UNO_ANY_H
+#define INCLUDED_COM_SUN_STAR_UNO_ANY_H
 
 #include <uno/any2.h>
 #include <typelib/typedescription.h>
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index 04115a56b3c1..095c727874ae 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.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 _COM_SUN_STAR_UNO_ANY_HXX_
-#define _COM_SUN_STAR_UNO_ANY_HXX_
+#ifndef INCLUDED_COM_SUN_STAR_UNO_ANY_HXX
+#define INCLUDED_COM_SUN_STAR_UNO_ANY_HXX
 
 #include "sal/config.h"
 
diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h
index 73a860802857..55b263f01016 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -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 _COM_SUN_STAR_UNO_REFERENCE_H_
-#define _COM_SUN_STAR_UNO_REFERENCE_H_
+#ifndef INCLUDED_COM_SUN_STAR_UNO_REFERENCE_H
+#define INCLUDED_COM_SUN_STAR_UNO_REFERENCE_H
 
 #include <rtl/alloc.h>
 
diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx
index a358c97811d1..9726860b2eca 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.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 _COM_SUN_STAR_UNO_REFERENCE_HXX_
-#define _COM_SUN_STAR_UNO_REFERENCE_HXX_
+#ifndef INCLUDED_COM_SUN_STAR_UNO_REFERENCE_HXX
+#define INCLUDED_COM_SUN_STAR_UNO_REFERENCE_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/RuntimeException.hpp>
diff --git a/include/com/sun/star/uno/Sequence.h b/include/com/sun/star/uno/Sequence.h
index 19a73eda9f71..d57200ad3144 100644
--- a/include/com/sun/star/uno/Sequence.h
+++ b/include/com/sun/star/uno/Sequence.h
@@ -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 _COM_SUN_STAR_UNO_SEQUENCE_H_
-#define _COM_SUN_STAR_UNO_SEQUENCE_H_
+#ifndef INCLUDED_COM_SUN_STAR_UNO_SEQUENCE_H
+#define INCLUDED_COM_SUN_STAR_UNO_SEQUENCE_H
 
 #include "typelib/typedescription.h"
 #include "uno/sequence2.h"
diff --git a/include/com/sun/star/uno/Sequence.hxx b/include/com/sun/star/uno/Sequence.hxx
index 9ce88d35b2a4..a37a222c7b72 100644
--- a/include/com/sun/star/uno/Sequence.hxx
+++ b/include/com/sun/star/uno/Sequence.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 _COM_SUN_STAR_UNO_SEQUENCE_HXX_
-#define _COM_SUN_STAR_UNO_SEQUENCE_HXX_
+#ifndef INCLUDED_COM_SUN_STAR_UNO_SEQUENCE_HXX
+#define INCLUDED_COM_SUN_STAR_UNO_SEQUENCE_HXX
 
 #include "sal/config.h"
 
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index 1d71910b28ec..97236229452d 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -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 _COM_SUN_STAR_UNO_TYPE_H_
-#define _COM_SUN_STAR_UNO_TYPE_H_
+#ifndef INCLUDED_COM_SUN_STAR_UNO_TYPE_H
+#define INCLUDED_COM_SUN_STAR_UNO_TYPE_H
 
 #include <typelib/typedescription.h>
 #include <com/sun/star/uno/TypeClass.hdl>
diff --git a/include/com/sun/star/uno/Type.hxx b/include/com/sun/star/uno/Type.hxx
index 40528af116ad..5ee68d220a15 100644
--- a/include/com/sun/star/uno/Type.hxx
+++ b/include/com/sun/star/uno/Type.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 _COM_SUN_STAR_UNO_TYPE_HXX_
-#define _COM_SUN_STAR_UNO_TYPE_HXX_
+#ifndef INCLUDED_COM_SUN_STAR_UNO_TYPE_HXX
+#define INCLUDED_COM_SUN_STAR_UNO_TYPE_HXX
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Type.h>
diff --git a/include/com/sun/star/uno/genfunc.h b/include/com/sun/star/uno/genfunc.h
index 12b6ad7d4640..0daec61f7049 100644
--- a/include/com/sun/star/uno/genfunc.h
+++ b/include/com/sun/star/uno/genfunc.h
@@ -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 _COM_SUN_STAR_UNO_GENFUNC_H_
-#define _COM_SUN_STAR_UNO_GENFUNC_H_
+#ifndef INCLUDED_COM_SUN_STAR_UNO_GENFUNC_H
+#define INCLUDED_COM_SUN_STAR_UNO_GENFUNC_H
 
 #include "sal/types.h"
 
diff --git a/include/com/sun/star/uno/genfunc.hxx b/include/com/sun/star/uno/genfunc.hxx
index 179f676d1afe..1465af0a1ea9 100644
--- a/include/com/sun/star/uno/genfunc.hxx
+++ b/include/com/sun/star/uno/genfunc.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 _COM_SUN_STAR_UNO_GENFUNC_HXX_
-#define _COM_SUN_STAR_UNO_GENFUNC_HXX_
+#ifndef INCLUDED_COM_SUN_STAR_UNO_GENFUNC_HXX
+#define INCLUDED_COM_SUN_STAR_UNO_GENFUNC_HXX
 
 #include <com/sun/star/uno/genfunc.h>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx
index 62546c0605e5..262dfd1b2230 100644
--- a/include/comphelper/ChainablePropertySet.hxx
+++ b/include/comphelper/ChainablePropertySet.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_CHAINABLEPROPERTYSET_HXX_
-#define _COMPHELPER_CHAINABLEPROPERTYSET_HXX_
+#ifndef INCLUDED_COMPHELPER_CHAINABLEPROPERTYSET_HXX
+#define INCLUDED_COMPHELPER_CHAINABLEPROPERTYSET_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx
index ce28803036d5..1de74e1cd41e 100644
--- a/include/comphelper/ChainablePropertySetInfo.hxx
+++ b/include/comphelper/ChainablePropertySetInfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX_
-#define _COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX_
+#ifndef INCLUDED_COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX
+#define INCLUDED_COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX
 
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <comphelper/PropertyInfoHash.hxx>
diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx
index 497a39fd500d..251236f57070 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.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 COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX
-#define COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_IDPROPARRAYHELPER_HXX
+#define INCLUDED_COMPHELPER_IDPROPARRAYHELPER_HXX
 
 #include <cppuhelper/component.hxx>
 #include <osl/mutex.hxx>
@@ -112,6 +112,6 @@ namespace comphelper
         return (*s_pMap)[nId];
     }
 }
-#endif // COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX
+#endif // INCLUDED_COMPHELPER_IDPROPARRAYHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/InlineContainer.hxx b/include/comphelper/InlineContainer.hxx
index b23574bbad58..8f9ffa648a1c 100644
--- a/include/comphelper/InlineContainer.hxx
+++ b/include/comphelper/InlineContainer.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 INCLUDED_COMPHELPER_INLINE_CONTAINER_HXX
-#define INCLUDED_COMPHELPER_INLINE_CONTAINER_HXX
+#ifndef INCLUDED_COMPHELPER_INLINECONTAINER_HXX
+#define INCLUDED_COMPHELPER_INLINECONTAINER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -138,6 +138,6 @@ public:
 } // namespace comphelper
 
 #endif
-// INCLUDED_COMPHELPER_INLINE_CONTAINER_HXX
+// INCLUDED_COMPHELPER_INLINECONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index 00784c4f16f2..7047b2258069 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_MASTERPROPERTYSETHELPER_HXX_
-#define _COMPHELPER_MASTERPROPERTYSETHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_MASTERPROPERTYSET_HXX
+#define INCLUDED_COMPHELPER_MASTERPROPERTYSET_HXX
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx
index d2c772e2c5d5..9a81588cfabf 100644
--- a/include/comphelper/MasterPropertySetInfo.hxx
+++ b/include/comphelper/MasterPropertySetInfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_MASTERPROPERTYSETINFO_HXX_
-#define _COMPHELPER_MASTERPROPERTYSETINFO_HXX_
+#ifndef INCLUDED_COMPHELPER_MASTERPROPERTYSETINFO_HXX
+#define INCLUDED_COMPHELPER_MASTERPROPERTYSETINFO_HXX
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <comphelper/PropertyInfoHash.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/include/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx
index 3241560b4a94..6796977c6792 100644
--- a/include/comphelper/PropertyInfoHash.hxx
+++ b/include/comphelper/PropertyInfoHash.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROPERTYINFOHASH_HXX_
-#define _COMPHELPER_PROPERTYINFOHASH_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPERTYINFOHASH_HXX
+#define INCLUDED_COMPHELPER_PROPERTYINFOHASH_HXX
 
 #include <rtl/ustring.hxx>
 #include <comphelper/TypeGeneration.hxx>
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 56e8375fd215..72b1ad8189de 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COMPHELPER_SELECTION_MULTIPLEX_HXX
-#define INCLUDED_COMPHELPER_SELECTION_MULTIPLEX_HXX
+#ifndef INCLUDED_COMPHELPER_SELECTIONMULTIPLEX_HXX
+#define INCLUDED_COMPHELPER_SELECTIONMULTIPLEX_HXX
 
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
@@ -100,6 +100,6 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // INCLUDED_COMPHELPER_SELECTION_MULTIPLEX_HXX
+#endif // INCLUDED_COMPHELPER_SELECTIONMULTIPLEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx
index af02cbd92067..37b7381c8b7b 100644
--- a/include/comphelper/SettingsHelper.hxx
+++ b/include/comphelper/SettingsHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_SETTINGSHELPER_HXX_
-#define _COMPHELPER_SETTINGSHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_SETTINGSHELPER_HXX
+#define INCLUDED_COMPHELPER_SETTINGSHELPER_HXX
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/include/comphelper/TypeGeneration.hxx b/include/comphelper/TypeGeneration.hxx
index 0ced57b31714..a2435729c4a5 100644
--- a/include/comphelper/TypeGeneration.hxx
+++ b/include/comphelper/TypeGeneration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_TYPEGENERATION_HXX_
-#define _COMPHELPER_TYPEGENERATION_HXX_
+#ifndef INCLUDED_COMPHELPER_TYPEGENERATION_HXX
+#define INCLUDED_COMPHELPER_TYPEGENERATION_HXX
 
 #include <sal/types.h>
 #include "comphelper/comphelperdllapi.h"
diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx
index dc31550e8e5b..53ec9e10a58a 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
-#define COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLECOMPONENTHELPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLECOMPONENTHELPER_HXX
 
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
@@ -131,7 +131,7 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLECOMPONENTHELPER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index f01c9117c400..6e523d96afec 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX
-#define COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLECONTEXTHELPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLECONTEXTHELPER_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -339,7 +339,7 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLECONTEXTHELPER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx
index 4849b124cf87..527a8e99034b 100644
--- a/include/comphelper/accessiblekeybindinghelper.hxx
+++ b/include/comphelper/accessiblekeybindinghelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_ACCESSIBLE_KEYBINDING_HELPER_HXX
-#define COMPHELPER_ACCESSIBLE_KEYBINDING_HELPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX
 
 #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -70,6 +70,6 @@ namespace comphelper
 }   // namespace comphelper
 //..............................................................................
 
-#endif // COMPHELPER_ACCESSIBLE_KEYBINDING_HELPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx
index e1bb5dd5f1ef..2ed234872caf 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX
-#define COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX
 
 #include <comphelper/uno3.hxx>
 #include <comphelper/accessiblecomponenthelper.hxx>
@@ -119,6 +119,6 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx
index ea3f505ee7fe..a3e80b6f3536 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_ACCESSIBLE_TEXT_HELPER_HXX
-#define COMPHELPER_ACCESSIBLE_TEXT_HELPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX
 
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/TextSegment.hpp>
@@ -139,7 +139,7 @@ namespace comphelper
 }   // namespace comphelper
 //..............................................................................
 
-#endif // COMPHELPER_ACCESSIBLE_TEXT_HELPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX
 
 
 // -----------------------------------------------------------------------------
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index fbd65d638899..36e39dafa1d1 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_ACCESSIBLE_WRAPPER_HXX
-#define COMPHELPER_ACCESSIBLE_WRAPPER_HXX
+#ifndef INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX
+#define INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX
 
 #include <comphelper/proxyaggregation.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -405,6 +405,6 @@ namespace comphelper
 }   // namespace accessibility
 //.............................................................................
 
-#endif // COMPHELPER_ACCESSIBLE_WRAPPER_HXX
+#endif // INCLUDED_COMPHELPER_ACCESSIBLEWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index d3a1ed4c2274..4406f9981338 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_ACCIMPLACCESS_HXX
-#define COMPHELPER_ACCIMPLACCESS_HXX
+#ifndef INCLUDED_COMPHELPER_ACCIMPLACCESS_HXX
+#define INCLUDED_COMPHELPER_ACCIMPLACCESS_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -135,7 +135,7 @@ namespace comphelper
 //.........................................................................
 
 
-#endif // COMPHELPER_ACCIMPLACCESS_HXX
+#endif // INCLUDED_COMPHELPER_ACCIMPLACCESS_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx
index fb17b7ca67ec..9ddcbf92683b 100644
--- a/include/comphelper/anycompare.hxx
+++ b/include/comphelper/anycompare.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_ANYCOMPARE_HXX
-#define COMPHELPER_ANYCOMPARE_HXX
+#ifndef INCLUDED_COMPHELPER_ANYCOMPARE_HXX
+#define INCLUDED_COMPHELPER_ANYCOMPARE_HXX
 
 #include "comphelper/comphelperdllapi.h"
 
@@ -214,6 +214,6 @@ namespace comphelper
 } // namespace comphelper
 //......................................................................................................................
 
-#endif // COMPHELPER_ANYCOMPARE_HXX
+#endif // INCLUDED_COMPHELPER_ANYCOMPARE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index 19c1910dbc8f..64bbae4352c8 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_ASYNCNOTIFICATION_HXX
-#define COMPHELPER_ASYNCNOTIFICATION_HXX
+#ifndef INCLUDED_COMPHELPER_ASYNCNOTIFICATION_HXX
+#define INCLUDED_COMPHELPER_ASYNCNOTIFICATION_HXX
 
 #include "sal/config.h"
 
@@ -179,6 +179,6 @@ namespace comphelper
 } // namespace comphelper
 //........................................................................
 
-#endif // COMPHELPER_ASYNCNOTIFICATION_HXX
+#endif // INCLUDED_COMPHELPER_ASYNCNOTIFICATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx
index dd10e13c70ab..40990f652a71 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_ATTRIBUTE_LIST_HXX
-#define _COMPHELPER_ATTRIBUTE_LIST_HXX
+#ifndef INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
+#define INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -61,6 +61,6 @@ public:
 
 } // namespace comphelper
 
-#endif // _COMPHELPER_ATTRIBUTE_LIST_HXX
+#endif // INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index 42eea8076e47..9b7389c88847 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_BASIC_IO_HXX_
-#define _COMPHELPER_BASIC_IO_HXX_
+#ifndef INCLUDED_COMPHELPER_BASICIO_HXX
+#define INCLUDED_COMPHELPER_BASICIO_HXX
 
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
@@ -94,6 +94,6 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (const starun
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_BASIC_IO_HXX_
+#endif // INCLUDED_COMPHELPER_BASICIO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/broadcasthelper.hxx b/include/comphelper/broadcasthelper.hxx
index d8cf69eeb17b..82559260f599 100644
--- a/include/comphelper/broadcasthelper.hxx
+++ b/include/comphelper/broadcasthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
-#define _COMPHELPER_BROADCASTHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_BROADCASTHELPER_HXX
+#define INCLUDED_COMPHELPER_BROADCASTHELPER_HXX
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.h>
@@ -58,6 +58,6 @@ namespace comphelper
         mutable ::osl::Mutex m_aMutex;
     };
 }
-#endif // _COMPHELPER_BROADCASTHELPER_HXX_
+#endif // INCLUDED_COMPHELPER_BROADCASTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx
index 3410207a58d8..3a0da99dc784 100644
--- a/include/comphelper/classids.hxx
+++ b/include/comphelper/classids.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 _COMPHELPER_CLASSIDS_HXX
-#define _COMPHELPER_CLASSIDS_HXX
+#ifndef INCLUDED_COMPHELPER_CLASSIDS_HXX
+#define INCLUDED_COMPHELPER_CLASSIDS_HXX
 
 /*
  * StarWriter
diff --git a/include/comphelper/comphelperdllapi.h b/include/comphelper/comphelperdllapi.h
index 88d35f61c359..271e141c3f1b 100644
--- a/include/comphelper/comphelperdllapi.h
+++ b/include/comphelper/comphelperdllapi.h
@@ -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 INCLUDED_COMPHELPERDLLAPI_H
-#define INCLUDED_COMPHELPERDLLAPI_H
+#ifndef INCLUDED_COMPHELPER_COMPHELPERDLLAPI_H
+#define INCLUDED_COMPHELPER_COMPHELPERDLLAPI_H
 
 #include "sal/types.h"
 
@@ -28,6 +28,6 @@
 #endif
 #define COMPHELPER_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_COMPHELPERDLLAPI_H */
+#endif // INCLUDED_COMPHELPER_COMPHELPERDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx
index d3043e7ac697..d71e80569438 100644
--- a/include/comphelper/componentbase.hxx
+++ b/include/comphelper/componentbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_COMPONENTBASE_HXX
-#define COMPHELPER_COMPONENTBASE_HXX
+#ifndef INCLUDED_COMPHELPER_COMPONENTBASE_HXX
+#define INCLUDED_COMPHELPER_COMPONENTBASE_HXX
 
 #include "comphelper/comphelperdllapi.h"
 #include <cppuhelper/interfacecontainer.hxx>
@@ -149,6 +149,6 @@ namespace comphelper
 } // namespace ComponentBase
 //........................................................................
 
-#endif // COMPHELPER_COMPONENTBASE_HXX
+#endif // INCLUDED_COMPHELPER_COMPONENTBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx
index eb1cfbcc24a8..d9651675b9d2 100644
--- a/include/comphelper/componentguard.hxx
+++ b/include/comphelper/componentguard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_COMPONENTGUARD_HXX
-#define COMPHELPER_COMPONENTGUARD_HXX
+#ifndef INCLUDED_COMPHELPER_COMPONENTGUARD_HXX
+#define INCLUDED_COMPHELPER_COMPONENTGUARD_HXX
 
 #include <com/sun/star/lang/DisposedException.hpp>
 
@@ -58,6 +58,6 @@ namespace comphelper
 } // namespace comphelper
 //......................................................................................................................
 
-#endif // COMPHELPER_COMPONENTGUARD_HXX
+#endif // INCLUDED_COMPHELPER_COMPONENTGUARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 95fea19b7783..41f3b4e76666 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.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 COMPHELPER_INC_COMPHELPER_COMPONENTMODULE_HXX
-#define COMPHELPER_INC_COMPHELPER_COMPONENTMODULE_HXX
+#ifndef INCLUDED_COMPHELPER_COMPONENTMODULE_HXX
+#define INCLUDED_COMPHELPER_COMPONENTMODULE_HXX
 
 #include <comphelper/comphelperdllapi.h>
 
@@ -256,6 +256,6 @@ namespace comphelper
 } // namespace comphelper
 //........................................................................
 
-#endif // COMPHELPER_INC_COMPHELPER_COMPONENTMODULE_HXX
+#endif // INCLUDED_COMPHELPER_COMPONENTMODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx
index b6377c16e37d..9d1a93448ced 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_
-#define _COMPHELPER_CONFIGURATIONHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_CONFIGURATIONHELPER_HXX
+#define INCLUDED_COMPHELPER_CONFIGURATIONHELPER_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -235,6 +235,6 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
 
 } // namespace comphelper
 
-#endif // _COMPHELPER_CONFIGURATIONHELPER_HXX_
+#endif // INCLUDED_COMPHELPER_CONFIGURATIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx
index d6c5be927873..27c3d7916507 100644
--- a/include/comphelper/container.hxx
+++ b/include/comphelper/container.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_CONTAINER_HXX_
-#define _COMPHELPER_CONTAINER_HXX_
+#ifndef INCLUDED_COMPHELPER_CONTAINER_HXX
+#define INCLUDED_COMPHELPER_CONTAINER_HXX
 
 #include <vector>
 #include "com/sun/star/uno/Reference.hxx"
@@ -74,7 +74,7 @@ protected:
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_CONTAINER_HXX_
+#endif // INCLUDED_COMPHELPER_CONTAINER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index 40265e12f6d8..8903af3e9240 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_CONTAINERMULTIPLEXER_HXX_
-#define _COMPHELPER_CONTAINERMULTIPLEXER_HXX_
+#ifndef INCLUDED_COMPHELPER_CONTAINERMULTIPLEXER_HXX
+#define INCLUDED_COMPHELPER_CONTAINERMULTIPLEXER_HXX
 
 #include <com/sun/star/container/XContainer.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -101,6 +101,6 @@ namespace comphelper
 }   // namespace dbaui
 //.........................................................................
 
-#endif // _COMPHELPER_CONTAINERMULTIPLEXER_HXX_
+#endif // INCLUDED_COMPHELPER_CONTAINERMULTIPLEXER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index 24fd868c0735..991d73bd43af 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_DOCPASSWORDHELPR_HXX
-#define COMPHELPER_DOCPASSWORDHELPR_HXX
+#ifndef INCLUDED_COMPHELPER_DOCPASSWORDHELPER_HXX
+#define INCLUDED_COMPHELPER_DOCPASSWORDHELPER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include "comphelper/comphelperdllapi.h"
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index ffeaacba5d46..e2260c501bc5 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_DOCPASSWORDREQUEST_HXX
-#define COMPHELPER_DOCPASSWORDREQUEST_HXX
+#ifndef INCLUDED_COMPHELPER_DOCPASSWORDREQUEST_HXX
+#define INCLUDED_COMPHELPER_DOCPASSWORDREQUEST_HXX
 
 #include "comphelper/comphelperdllapi.h"
 #include <com/sun/star/task/PasswordRequestMode.hpp>
diff --git a/include/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx
index 2bc00220995f..342e53fd560b 100644
--- a/include/comphelper/documentconstants.hxx
+++ b/include/comphelper/documentconstants.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 _COMPHELPER_DOCUMENTCONSTANTS_HXX
-#define _COMPHELPER_DOCUMENTCONSTANTS_HXX
+#ifndef INCLUDED_COMPHELPER_DOCUMENTCONSTANTS_HXX
+#define INCLUDED_COMPHELPER_DOCUMENTCONSTANTS_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/include/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx
index 48bc39a8cc00..fa3df30435dc 100644
--- a/include/comphelper/documentinfo.hxx
+++ b/include/comphelper/documentinfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_DOCUMENTINFO_HXX
-#define COMPHELPER_DOCUMENTINFO_HXX
+#ifndef INCLUDED_COMPHELPER_DOCUMENTINFO_HXX
+#define INCLUDED_COMPHELPER_DOCUMENTINFO_HXX
 
 #include "comphelper/comphelperdllapi.h"
 
@@ -46,6 +46,6 @@ namespace comphelper {
 }   // namespace comphelper
 //........................................................................
 
-#endif // COMPHELPER_DOCUMENTINFO_HXX
+#endif // INCLUDED_COMPHELPER_DOCUMENTINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx
index f60506651fca..af2f422a2023 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.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 _COMPHELPER_OBJECTCONTAINER_HXX_
-#define _COMPHELPER_OBJECTCONTAINER_HXX_
+#ifndef INCLUDED_COMPHELPER_EMBEDDEDOBJECTCONTAINER_HXX
+#define INCLUDED_COMPHELPER_EMBEDDEDOBJECTCONTAINER_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index 27b20c20fd24..f2d8841ac4fb 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_ENUMHELPER_HXX_
-#define _COMPHELPER_ENUMHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_ENUMHELPER_HXX
+#define INCLUDED_COMPHELPER_ENUMHELPER_HXX
 
 #include <vector>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -136,7 +136,7 @@ public:
 }
 //... namespace comphelper .......................................................
 
-#endif // _COMPHELPER_ENUMHELPER_HXX_
+#endif // INCLUDED_COMPHELPER_ENUMHELPER_HXX
 
 
 
diff --git a/include/comphelper/eventattachermgr.hxx b/include/comphelper/eventattachermgr.hxx
index a525e7c4ea54..3c9ef129ef51 100644
--- a/include/comphelper/eventattachermgr.hxx
+++ b/include/comphelper/eventattachermgr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_EVENTATTACHERMGR_HXX_
-#define _COMPHELPER_EVENTATTACHERMGR_HXX_
+#ifndef INCLUDED_COMPHELPER_EVENTATTACHERMGR_HXX
+#define INCLUDED_COMPHELPER_EVENTATTACHERMGR_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include "comphelper/comphelperdllapi.h"
@@ -47,6 +47,6 @@ createEventAttacherManager(
 
 }
 
-#endif // _COMPHELPER_EVENTATTACHERMGR_HXX_
+#endif // INCLUDED_COMPHELPER_EVENTATTACHERMGR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx
index c1bb01fa3aa4..3398e303bf39 100644
--- a/include/comphelper/evtlistenerhlp.hxx
+++ b/include/comphelper/evtlistenerhlp.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 COMPHELPER_EVENTLISTENERHELPER_HXX
-#define COMPHELPER_EVENTLISTENERHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_EVTLISTENERHLP_HXX
+#define INCLUDED_COMPHELPER_EVTLISTENERHLP_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
@@ -45,6 +45,6 @@ namespace comphelper
 //........................................................................
 }   // namespace comphelper
 //........................................................................
-#endif // COMPHELPER_EVENTLISTENERHELPER_HXX
+#endif // INCLUDED_COMPHELPER_EVTLISTENERHLP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/evtmethodhelper.hxx b/include/comphelper/evtmethodhelper.hxx
index 787a3c4d0002..cf28dfe6ed09 100644
--- a/include/comphelper/evtmethodhelper.hxx
+++ b/include/comphelper/evtmethodhelper.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 COMPHELPER_EVENTMETHODHELPER_HXX
-#define COMPHELPER_EVENTMETHODHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_EVTMETHODHELPER_HXX
+#define INCLUDED_COMPHELPER_EVTMETHODHELPER_HXX
 #include <comphelper/sequence.hxx>
 //........................................................................
 namespace comphelper
diff --git a/include/comphelper/expandmacro.hxx b/include/comphelper/expandmacro.hxx
index d699a1aaf94b..b795357c7785 100644
--- a/include/comphelper/expandmacro.hxx
+++ b/include/comphelper/expandmacro.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef COMPHELPER_EXPANDMACRO_HXX_INCLUDED
-#define COMPHELPER_EXPANDMACRO_HXX_INCLUDED
+#ifndef INCLUDED_COMPHELPER_EXPANDMACRO_HXX
+#define INCLUDED_COMPHELPER_EXPANDMACRO_HXX
 
 #include "rtl/ustring.hxx"
 #include "comphelper/comphelperdllapi.h"
diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx
index 30cbaaefc6c9..2cc12c2abceb 100644
--- a/include/comphelper/extract.hxx
+++ b/include/comphelper/extract.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 _COMPHELPER_EXTRACT_HXX_
-#define _COMPHELPER_EXTRACT_HXX_
+#ifndef INCLUDED_COMPHELPER_EXTRACT_HXX
+#define INCLUDED_COMPHELPER_EXTRACT_HXX
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
diff --git a/include/comphelper/fileformat.h b/include/comphelper/fileformat.h
index dbd3f32a1f9a..fb9d8175f2e3 100644
--- a/include/comphelper/fileformat.h
+++ b/include/comphelper/fileformat.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_FILEFORMAT_H_
-#define _COMPHELPER_FILEFORMAT_H_
+#ifndef INCLUDED_COMPHELPER_FILEFORMAT_H
+#define INCLUDED_COMPHELPER_FILEFORMAT_H
 
 /* file format versions *************************************************/
 
diff --git a/include/comphelper/flagguard.hxx b/include/comphelper/flagguard.hxx
index af1f1ea1e4fd..713e624e9b47 100644
--- a/include/comphelper/flagguard.hxx
+++ b/include/comphelper/flagguard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_FLAGGUARD_HXX
-#define COMPHELPER_FLAGGUARD_HXX
+#ifndef INCLUDED_COMPHELPER_FLAGGUARD_HXX
+#define INCLUDED_COMPHELPER_FLAGGUARD_HXX
 
 #include "comphelper/scopeguard.hxx"
 
@@ -73,6 +73,6 @@ namespace comphelper
 } // namespace comphelper
 //......................................................................................................................
 
-#endif // COMPHELPER_FLAGGUARD_HXX
+#endif // INCLUDED_COMPHELPER_FLAGGUARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/genericpropertyset.hxx b/include/comphelper/genericpropertyset.hxx
index e46c30a4cad4..359d182b6ed8 100644
--- a/include/comphelper/genericpropertyset.hxx
+++ b/include/comphelper/genericpropertyset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_GENERICPROPERTYSET_HXX_
-#define _COMPHELPER_GENERICPROPERTYSET_HXX_
+#ifndef INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX
+#define INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX
 
 #include <comphelper/propertysetinfo.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -29,6 +29,6 @@ namespace comphelper
     COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GenericPropertySet_CreateInstance( PropertySetInfo* pInfo );
 }
 
-#endif // _COMPHELPER_GENERICPROPERTYSET_HXX_
+#endif // INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/guarding.hxx b/include/comphelper/guarding.hxx
index 3931c0284e31..f52650a5da1c 100644
--- a/include/comphelper/guarding.hxx
+++ b/include/comphelper/guarding.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_GUARDING_HXX_
-#define _COMPHELPER_GUARDING_HXX_
+#ifndef INCLUDED_COMPHELPER_GUARDING_HXX
+#define INCLUDED_COMPHELPER_GUARDING_HXX
 
 #include <osl/mutex.hxx>
 
@@ -51,6 +51,6 @@ typedef ORelease< ::osl::Mutex >    MutexRelease;
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_GUARDING_HXX_
+#endif // INCLUDED_COMPHELPER_GUARDING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/ihwrapnofilter.hxx b/include/comphelper/ihwrapnofilter.hxx
index 0af98b965be8..513bb225731d 100644
--- a/include/comphelper/ihwrapnofilter.hxx
+++ b/include/comphelper/ihwrapnofilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_INTERACTIONHANDLERWRAPPER_HXX_
-#define _COMPHELPER_INTERACTIONHANDLERWRAPPER_HXX_
+#ifndef INCLUDED_COMPHELPER_IHWRAPNOFILTER_HXX
+#define INCLUDED_COMPHELPER_IHWRAPNOFILTER_HXX
 
 #include <com/sun/star/task/XInteractionHandler2.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/include/comphelper/implementationreference.hxx b/include/comphelper/implementationreference.hxx
index 7957d6437ff5..4432c2e18272 100644
--- a/include/comphelper/implementationreference.hxx
+++ b/include/comphelper/implementationreference.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
-#define _COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
+#ifndef INCLUDED_COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
+#define INCLUDED_COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
@@ -262,6 +262,6 @@ namespace comphelper
 
 }
 
-#endif // _COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
+#endif // INCLUDED_COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index d72cc2119c4a..68ef19dd1543 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_INTERACTION_HXX_
-#define _COMPHELPER_INTERACTION_HXX_
+#ifndef INCLUDED_COMPHELPER_INTERACTION_HXX
+#define INCLUDED_COMPHELPER_INTERACTION_HXX
 
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -155,7 +155,7 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_INTERACTION_HXX_
+#endif // INCLUDED_COMPHELPER_INTERACTION_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index dc61467ccfa5..888508b6b328 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_INC_COMPHELPER_LISTENERNOTIFICATION_HXX
-#define COMPHELPER_INC_COMPHELPER_LISTENERNOTIFICATION_HXX
+#ifndef INCLUDED_COMPHELPER_LISTENERNOTIFICATION_HXX
+#define INCLUDED_COMPHELPER_LISTENERNOTIFICATION_HXX
 
 #include <cppuhelper/interfacecontainer.hxx>
 
@@ -293,6 +293,6 @@ namespace comphelper
 } // namespace comphelper
 //........................................................................
 
-#endif // COMPHELPER_INC_COMPHELPER_LISTENERNOTIFICATION_HXX
+#endif // INCLUDED_COMPHELPER_LISTENERNOTIFICATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 142db5b5e603..0f53a042111b 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_LOGGING_HXX
-#define COMPHELPER_LOGGING_HXX
+#ifndef INCLUDED_COMPHELPER_LOGGING_HXX
+#define INCLUDED_COMPHELPER_LOGGING_HXX
 
 #include <comphelper/comphelperdllapi.h>
 
@@ -721,6 +721,6 @@ namespace comphelper
 } // namespace comphelper
 //........................................................................
 
-#endif // COMPHELPER_LOGGING_HXX
+#endif // INCLUDED_COMPHELPER_LOGGING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/makesequence.hxx b/include/comphelper/makesequence.hxx
index bc35657db9a8..19d1e8e7e257 100644
--- a/include/comphelper/makesequence.hxx
+++ b/include/comphelper/makesequence.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_MAKESEQUENCE_HXX_INCLUDED
-#define COMPHELPER_MAKESEQUENCE_HXX_INCLUDED
+#ifndef INCLUDED_COMPHELPER_MAKESEQUENCE_HXX
+#define INCLUDED_COMPHELPER_MAKESEQUENCE_HXX
 
 #include "com/sun/star/uno/Sequence.hxx"
 #include "boost/preprocessor/cat.hpp"
@@ -75,6 +75,6 @@ BOOST_PP_REPEAT_FROM_TO(2, BOOST_PP_ADD(COMPHELPER_MAKESEQUENCE_MAX_ARGS, 1),
 
 } // namespace comphelper
 
-#endif //  ! defined(COMPHELPER_MAKESEQUENCE_HXX_INCLUDED)
+#endif //  ! defined( INCLUDED_COMPHELPER_MAKESEQUENCE_HXX)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/mediadescriptor.hxx b/include/comphelper/mediadescriptor.hxx
index 5f353e552753..3ca74d95ddf6 100644
--- a/include/comphelper/mediadescriptor.hxx
+++ b/include/comphelper/mediadescriptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_MEDIADESCRIPTOR_HXX_
-#define _COMPHELPER_MEDIADESCRIPTOR_HXX_
+#ifndef INCLUDED_COMPHELPER_MEDIADESCRIPTOR_HXX
+#define INCLUDED_COMPHELPER_MEDIADESCRIPTOR_HXX
 
 #include <comphelper/sequenceashashmap.hxx>
 #include <rtl/ustring.hxx>
@@ -293,6 +293,6 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
 
 } // namespace comphelper
 
-#endif // _COMPHELPER_MEDIADESCRIPTOR_HXX_
+#endif // INCLUDED_COMPHELPER_MEDIADESCRIPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx
index 6e2b128d5a23..293d21154603 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_
-#define _COMPHELPER_MIMECONFIGHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_MIMECONFIGHELPER_HXX
+#define INCLUDED_COMPHELPER_MIMECONFIGHELPER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -136,6 +136,6 @@ public:
 
 }
 
-#endif // _COMPHELPER_MIMECONFIGHELPER_HXX_
+#endif // INCLUDED_COMPHELPER_MIMECONFIGHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/namecontainer.hxx b/include/comphelper/namecontainer.hxx
index 6ac5aff190fb..1e600ae5eda8 100644
--- a/include/comphelper/namecontainer.hxx
+++ b/include/comphelper/namecontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_NAMECONTAINER_HXX_
-#define _COMPHELPER_NAMECONTAINER_HXX_
+#ifndef INCLUDED_COMPHELPER_NAMECONTAINER_HXX
+#define INCLUDED_COMPHELPER_NAMECONTAINER_HXX
 
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -30,6 +30,6 @@ namespace comphelper
         NameContainer_createInstance( ::com::sun::star::uno::Type aType );
 }
 
-#endif // _COMPHELPER_NAMECONTAINER_HXX_
+#endif // INCLUDED_COMPHELPER_NAMECONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx
index 855e9e6bd0e6..c625f24cdcbc 100644
--- a/include/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX
-#define COMPHELPER_NAMEDVALUECOLLECTION_HXX
+#ifndef INCLUDED_COMPHELPER_NAMEDVALUECOLLECTION_HXX
+#define INCLUDED_COMPHELPER_NAMEDVALUECOLLECTION_HXX
 
 #include <comphelper/comphelperdllapi.h>
 
@@ -362,6 +362,6 @@ namespace comphelper
 } // namespace comphelper
 //........................................................................
 
-#endif // COMPHELPER_NAMEDVALUECOLLECTION_HXX
+#endif // INCLUDED_COMPHELPER_NAMEDVALUECOLLECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/newarray.hxx b/include/comphelper/newarray.hxx
index b64095ae8ff4..b34dc13332b5 100644
--- a/include/comphelper/newarray.hxx
+++ b/include/comphelper/newarray.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_NEW_ARRAY_HXX
-#define COMPHELPER_NEW_ARRAY_HXX
+#ifndef INCLUDED_COMPHELPER_NEWARRAY_HXX
+#define INCLUDED_COMPHELPER_NEWARRAY_HXX
 
 #include <limits>
 #include <new>
@@ -46,6 +46,6 @@ newArray_ex(size_t const n)
 
 } // namespace comphelper
 
-#endif // COMPHELPER_NEW_ARRAY_HXX
+#endif // INCLUDED_COMPHELPER_NEWARRAY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 38f0eaa633a1..351b1014abec 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_NUMBEREDCOLLECTION_HXX_
-#define _COMPHELPER_NUMBEREDCOLLECTION_HXX_
+#ifndef INCLUDED_COMPHELPER_NUMBEREDCOLLECTION_HXX
+#define INCLUDED_COMPHELPER_NUMBEREDCOLLECTION_HXX
 
 #include "comphelper/comphelperdllapi.h"
 
@@ -171,6 +171,6 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
 
 } // namespace comphelper
 
-#endif // _COMPHELPER_NUMBEREDCOLLECTION_HXX_
+#endif // INCLUDED_COMPHELPER_NUMBEREDCOLLECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/numbers.hxx b/include/comphelper/numbers.hxx
index b64fe341da4f..18c7e2e44473 100644
--- a/include/comphelper/numbers.hxx
+++ b/include/comphelper/numbers.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_NUMBERS_HXX_
-#define _COMPHELPER_NUMBERS_HXX_
+#ifndef INCLUDED_COMPHELPER_NUMBERS_HXX
+#define INCLUDED_COMPHELPER_NUMBERS_HXX
 
 #include <com/sun/star/util/XNumberFormats.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
@@ -62,6 +62,6 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_NUMBERS_HXX_
+#endif // INCLUDED_COMPHELPER_NUMBERS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx
index a326a59d219b..29279ab5b5c6 100644
--- a/include/comphelper/officeresourcebundle.hxx
+++ b/include/comphelper/officeresourcebundle.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_OFFICE_RESOURCE_BUNDLE_HXX
-#define COMPHELPER_OFFICE_RESOURCE_BUNDLE_HXX
+#ifndef INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX
+#define INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX
 
 #include <comphelper/comphelperdllapi.h>
 
@@ -89,6 +89,6 @@ namespace comphelper
 } // namespace comphelper
 //........................................................................
 
-#endif // COMPHELPER_OFFICE_RESOURCE_BUNDLE_HXX
+#endif // INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx
index e054d0dbc909..41d641a652e3 100644
--- a/include/comphelper/ofopxmlhelper.hxx
+++ b/include/comphelper/ofopxmlhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_OFOPXMLHELPER_HXX
-#define _COMPHELPER_OFOPXMLHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_OFOPXMLHELPER_HXX
+#define INCLUDED_COMPHELPER_OFOPXMLHELPER_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx
index cdee28870fba..d0ccbef4e05e 100644
--- a/include/comphelper/oslfile2streamwrap.hxx
+++ b/include/comphelper/oslfile2streamwrap.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 _COMPHELPER_STREAM_OSLFILEWRAPPER_HXX_
-#define _COMPHELPER_STREAM_OSLFILEWRAPPER_HXX_
+#ifndef INCLUDED_COMPHELPER_OSLFILE2STREAMWRAP_HXX
+#define INCLUDED_COMPHELPER_OSLFILE2STREAMWRAP_HXX
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/io/XOutputStream.hpp>
@@ -75,6 +75,6 @@ private:
 }   // namespace comphelper
 
 
-#endif // _COMPHELPER_STREAM_OSLFILEWRAPPER_HXX_
+#endif // INCLUDED_COMPHELPER_OSLFILE2STREAMWRAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/processfactory.hxx b/include/comphelper/processfactory.hxx
index a7edbb9cddff..36f54ba4f885 100644
--- a/include/comphelper/processfactory.hxx
+++ b/include/comphelper/processfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
-#define _COMPHELPER_PROCESSFACTORY_HXX_
+#ifndef INCLUDED_COMPHELPER_PROCESSFACTORY_HXX
+#define INCLUDED_COMPHELPER_PROCESSFACTORY_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -71,6 +71,6 @@ getProcessComponentContext();
 
 }
 
-#endif // _COMPHELPER_PROCESSFACTORY_HXX_
+#endif // INCLUDED_COMPHELPER_PROCESSFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 3a6ca83e36c1..ecd8f9812975 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROPERTY_AGGREGATION_HXX_
-#define _COMPHELPER_PROPERTY_AGGREGATION_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPAGG_HXX
+#define INCLUDED_COMPHELPER_PROPAGG_HXX
 
 #include <com/sun/star/uno/XAggregation.hpp>
 #include <comphelper/propstate.hxx>
@@ -320,6 +320,6 @@ protected:
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_PROPERTY_AGGREGATION_HXX_
+#endif // INCLUDED_COMPHELPER_PROPAGG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index 840213e88427..d3085a30591c 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_
-#define _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPARRHLP_HXX
+#define INCLUDED_COMPHELPER_PROPARRHLP_HXX
 
 #include <comphelper/stl_types.hxx>
 #include <comphelper/propagg.hxx>
@@ -169,7 +169,7 @@ template <class TYPE> inline
 }
 //... namespace comphelper ................................................
 
-#endif // _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_
+#endif // INCLUDED_COMPHELPER_PROPARRHLP_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx
index 95fe122d51a6..086565a7d87d 100644
--- a/include/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROPERTY_HXX_
-#define _COMPHELPER_PROPERTY_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPERTY_HXX
+#define INCLUDED_COMPHELPER_PROPERTY_HXX
 
 #include <cppuhelper/proptypehlp.hxx>
 #include <comphelper/extract.hxx>
@@ -200,6 +200,6 @@ COMPHELPER_DLLPUBLIC sal_Bool tryPropertyValue(staruno::Any& _rConvertedValue, s
 }
 //... namespace comphelper .......................................................
 
-#endif // _COMPHELPER_PROPERTY_HXX_
+#endif // INCLUDED_COMPHELPER_PROPERTY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx
index 1be13092450d..1327055f03f5 100644
--- a/include/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_PROPERTYBAG_HXX
-#define COMPHELPER_PROPERTYBAG_HXX
+#ifndef INCLUDED_COMPHELPER_PROPERTYBAG_HXX
+#define INCLUDED_COMPHELPER_PROPERTYBAG_HXX
 
 #include "comphelper/comphelperdllapi.h"
 #include <comphelper/propertycontainerhelper.hxx>
@@ -222,6 +222,6 @@ namespace comphelper
 } // namespace comphelper
 //........................................................................
 
-#endif // COMPHELPER_PROPERTYBAG_HXX
+#endif // INCLUDED_COMPHELPER_PROPERTYBAG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx
index 3d208413a722..4c44310837b6 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_
-#define _COMPHELPER_PROPERTYCONTAINER_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPERTYCONTAINER_HXX
+#define INCLUDED_COMPHELPER_PROPERTYCONTAINER_HXX
 
 #include <comphelper/propertycontainerhelper.hxx>
 #include <cppuhelper/propshlp.hxx>
@@ -84,7 +84,7 @@ protected:
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_PROPERTYCONTAINER_HXX_
+#endif // INCLUDED_COMPHELPER_PROPERTYCONTAINER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx
index 67eae2994b08..f0b4eef554c0 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_PROPERTYCONTAINERHELPER_HXX
-#define COMPHELPER_PROPERTYCONTAINERHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_PROPERTYCONTAINERHELPER_HXX
+#define INCLUDED_COMPHELPER_PROPERTYCONTAINERHELPER_HXX
 
 #include <cppuhelper/propshlp.hxx>
 #include <com/sun/star/uno/Type.hxx>
@@ -198,6 +198,6 @@ private:
 }   // namespace comphelper
 //.........................................................................
 
-#endif // COMPHELPER_PROPERTYCONTAINERHELPER_HXX
+#endif // INCLUDED_COMPHELPER_PROPERTYCONTAINERHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx
index ecc600c37d3c..29793b2cb54a 100644
--- a/include/comphelper/propertysethelper.hxx
+++ b/include/comphelper/propertysethelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROPERTYSETHELPER_HXX_
-#define _COMPHELPER_PROPERTYSETHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPERTYSETHELPER_HXX
+#define INCLUDED_COMPHELPER_PROPERTYSETHELPER_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index e0b863e8f2ca..ea11ba07b5f1 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROPERTSETINFO_HXX_
-#define _COMPHELPER_PROPERTSETINFO_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPERTYSETINFO_HXX
+#define INCLUDED_COMPHELPER_PROPERTYSETINFO_HXX
 
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx
index acd368646628..68ead5bf8c3e 100644
--- a/include/comphelper/propertystatecontainer.hxx
+++ b/include/comphelper/propertystatecontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX
-#define COMPHELPER_PROPERTYSTATECONTAINER_HXX
+#ifndef INCLUDED_COMPHELPER_PROPERTYSTATECONTAINER_HXX
+#define INCLUDED_COMPHELPER_PROPERTYSTATECONTAINER_HXX
 
 #include <comphelper/propertycontainer.hxx>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -109,6 +109,6 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // COMPHELPER_PROPERTYSTATECONTAINER_HXX
+#endif // INCLUDED_COMPHELPER_PROPERTYSTATECONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index 28795e57ce8a..ab2c36a1f6b6 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROPERTY_MULTIPLEX_HXX_
-#define _COMPHELPER_PROPERTY_MULTIPLEX_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX
+#define INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX
 
 #include <comphelper/propstate.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -104,6 +104,6 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_PROPERTY_MULTIPLEX_HXX_
+#endif // INCLUDED_COMPHELPER_PROPMULTIPLEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx
index 727f40d96824..0354e68f36b8 100644
--- a/include/comphelper/propstate.hxx
+++ b/include/comphelper/propstate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROPERTY_STATE_HXX_
-#define _COMPHELPER_PROPERTY_STATE_HXX_
+#ifndef INCLUDED_COMPHELPER_PROPSTATE_HXX
+#define INCLUDED_COMPHELPER_PROPSTATE_HXX
 
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -100,6 +100,6 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_PROPERTY_STATE_HXX_
+#endif // INCLUDED_COMPHELPER_PROPSTATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx
index 02c4997a2cb6..603ecc62e943 100644
--- a/include/comphelper/seekableinput.hxx
+++ b/include/comphelper/seekableinput.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 _COMPHELPER_STREAM_SEEKABLEINPUT_HXX_
-#define _COMPHELPER_STREAM_SEEKABLEINPUT_HXX_
+#ifndef INCLUDED_COMPHELPER_SEEKABLEINPUT_HXX
+#define INCLUDED_COMPHELPER_SEEKABLEINPUT_HXX
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index 9cb122bf8730..3c82e2e237e5 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.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 _COMPHELPER_SEQSTREAM_HXX
-#define _COMPHELPER_SEQSTREAM_HXX
+#ifndef INCLUDED_COMPHELPER_SEQSTREAM_HXX
+#define INCLUDED_COMPHELPER_SEQSTREAM_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -131,7 +131,7 @@ public:
 
 } // namespace comphelper
 
-#endif //_COMPHELPER_SEQSTREAM_HXX
+#endif // INCLUDED_COMPHELPER_SEQSTREAM_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index 4695042670fc..3d324769a4cc 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_SEQUENCE_HXX_
-#define _COMPHELPER_SEQUENCE_HXX_
+#ifndef INCLUDED_COMPHELPER_SEQUENCE_HXX
+#define INCLUDED_COMPHELPER_SEQUENCE_HXX
 
 #include <algorithm>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -354,6 +354,6 @@ namespace comphelper
 //.........................................................................
 
 
-#endif // _COMPHELPER_SEQUENCE_HXX_
+#endif // INCLUDED_COMPHELPER_SEQUENCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index 935f614070ff..9caa63abb7db 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_
-#define _COMPHELPER_SEQUENCEASHASHMAP_HXX_
+#ifndef INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX
+#define INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX
 
 #include <boost/unordered_map.hpp>
 
@@ -308,6 +308,6 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
 
 } // namespace comphelper
 
-#endif // _COMPHELPER_SEQUENCEASHASHMAP_HXX_
+#endif // INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/sequenceasvector.hxx b/include/comphelper/sequenceasvector.hxx
index 6e3ad171df43..5f1435da62ee 100644
--- a/include/comphelper/sequenceasvector.hxx
+++ b/include/comphelper/sequenceasvector.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_SEQUENCEASVECTOR_HXX_
-#define _COMPHELPER_SEQUENCEASVECTOR_HXX_
+#ifndef INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
+#define INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
 
 #include <vector>
 #include <algorithm>
@@ -242,6 +242,6 @@ class SequenceAsVector : public ::std::vector< TElementType >
 
 } // namespace comphelper
 
-#endif // _COMPHELPER_SEQUENCEASVECTOR_HXX_
+#endif // INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index be3b275cf215..f210fcd4fdfa 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.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 COMPHELPER_SERVICEDECL_HXX_INCLUDED
-#define COMPHELPER_SERVICEDECL_HXX_INCLUDED
+#ifndef INCLUDED_COMPHELPER_SERVICEDECL_HXX
+#define INCLUDED_COMPHELPER_SERVICEDECL_HXX
 
 #include <comphelper/comphelperdllapi.h>
 #include <cppuhelper/implbase1.hxx>
@@ -404,6 +404,6 @@ extern "C" \
 #define COMPHELPER_SERVICEDECL_EXPORTS8(compName,comp0_,comp1_,comp2_,comp3_,comp4_,comp5_,comp6_,comp7_) \
     COMPHELPER_SERVICEDECL_make_exports(compName,(comp0_)(comp1_)(comp2_)(comp3_)(comp4_)(comp5_)(comp6_)(comp7_))
 
-#endif //  ! defined(COMPHELPER_SERVICEDECL_HXX_INCLUDED)
+#endif //  ! defined( INCLUDED_COMPHELPER_SERVICEDECL_HXX)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/servicehelper.hxx b/include/comphelper/servicehelper.hxx
index a861e88db2d7..d0f2a261e71b 100644
--- a/include/comphelper/servicehelper.hxx
+++ b/include/comphelper/servicehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_SERVICEHELPER_HXX_
-#define _COMPHELPER_SERVICEHELPER_HXX_
+#ifndef INCLUDED_COMPHELPER_SERVICEHELPER_HXX
+#define INCLUDED_COMPHELPER_SERVICEHELPER_HXX
 
 #include <rtl/uuid.h>
 #include <rtl/instance.hxx>
@@ -102,6 +102,6 @@ sal_Int64 SAL_CALL classname::getSomething( const ::com::sun::star::uno::Sequenc
 }
 
 
-#endif // _COMPHELPER_SERVICEHELPER_HXX_
+#endif // INCLUDED_COMPHELPER_SERVICEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx
index b1468b9eab27..f0ff655bc86b 100644
--- a/include/comphelper/serviceinfohelper.hxx
+++ b/include/comphelper/serviceinfohelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_SERVICEINFOHELPER_HXX
-#define COMPHELPER_SERVICEINFOHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_SERVICEINFOHELPER_HXX
+#define INCLUDED_COMPHELPER_SERVICEINFOHELPER_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "comphelper/comphelperdllapi.h"
diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx
index 8013e7f404aa..9dbe2e72d208 100644
--- a/include/comphelper/sharedmutex.hxx
+++ b/include/comphelper/sharedmutex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_SHAREDMUTEX_HXX
-#define COMPHELPER_SHAREDMUTEX_HXX
+#ifndef INCLUDED_COMPHELPER_SHAREDMUTEX_HXX
+#define INCLUDED_COMPHELPER_SHAREDMUTEX_HXX
 
 #include "comphelper/comphelperdllapi.h"
 
@@ -81,6 +81,6 @@ namespace comphelper
 } // namespace comphelper
 //........................................................................
 
-#endif // COMPHELPER_SHAREDMUTEX_HXX
+#endif // INCLUDED_COMPHELPER_SHAREDMUTEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx
index 9397aa72bf64..a3501d7b7a6c 100644
--- a/include/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_STILLREADWRITEINTERACTION_HXX_
-#define _COMPHELPER_STILLREADWRITEINTERACTION_HXX_
+#ifndef INCLUDED_COMPHELPER_STILLREADWRITEINTERACTION_HXX
+#define INCLUDED_COMPHELPER_STILLREADWRITEINTERACTION_HXX
 
 #include <ucbhelper/interceptedinteraction.hxx>
 
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index a80cd4feac0f..de9e2ff7f5ff 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.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 _COMPHELPER_STLTYPES_HXX_
-#define _COMPHELPER_STLTYPES_HXX_
+#ifndef INCLUDED_COMPHELPER_STL_TYPES_HXX
+#define INCLUDED_COMPHELPER_STL_TYPES_HXX
 
 #include "sal/config.h"
 
@@ -268,6 +268,6 @@ OutputIter intersperse(
     typedef ::std::set< valuetype, comparefct > classname;  \
     DECLARE_STL_ITERATORS(classname)                        \
 
-#endif  // _COMPHELPER_STLTYPES_HXX_
+#endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/stlunosequence.hxx b/include/comphelper/stlunosequence.hxx
index c7b776f78d6e..1c61ed8dde3a 100644
--- a/include/comphelper/stlunosequence.hxx
+++ b/include/comphelper/stlunosequence.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_STLUNOITERATOR_HXX
-#define _COMPHELPER_STLUNOITERATOR_HXX
+#ifndef INCLUDED_COMPHELPER_STLUNOSEQUENCE_HXX
+#define INCLUDED_COMPHELPER_STLUNOSEQUENCE_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <sal/types.h>
diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx
index 093038e6e5ed..1c5a62c8ad68 100644
--- a/include/comphelper/storagehelper.hxx
+++ b/include/comphelper/storagehelper.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 COMPHELPER_STORAGEHELPER_HXX
-#define COMPHELPER_STORAGEHELPER_HXX
+#ifndef INCLUDED_COMPHELPER_STORAGEHELPER_HXX
+#define INCLUDED_COMPHELPER_STORAGEHELPER_HXX
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/include/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx
index 8f5657aff502..787f6964f625 100644
--- a/include/comphelper/streamsection.hxx
+++ b/include/comphelper/streamsection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_STREAMSECTION_HXX_
-#define _COMPHELPER_STREAMSECTION_HXX_
+#ifndef INCLUDED_COMPHELPER_STREAMSECTION_HXX
+#define INCLUDED_COMPHELPER_STREAMSECTION_HXX
 
 #include <com/sun/star/io/XMarkableStream.hpp>
 #include <com/sun/star/io/XDataInputStream.hpp>
@@ -73,6 +73,6 @@ public:
 
 }   // namespace comphelper
 
-#endif // _COMPHELPER_STREAMSECTION_HXX_
+#endif // INCLUDED_COMPHELPER_STREAMSECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx
index efeffea6b4eb..1e945171b377 100644
--- a/include/comphelper/synchronousdispatch.hxx
+++ b/include/comphelper/synchronousdispatch.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_SYNCHRONOUSDISPATCH_HXX
-#define _COMPHELPER_SYNCHRONOUSDISPATCH_HXX
+#ifndef INCLUDED_COMPHELPER_SYNCHRONOUSDISPATCH_HXX
+#define INCLUDED_COMPHELPER_SYNCHRONOUSDISPATCH_HXX
 
 #include "comphelper/comphelperdllapi.h"
 
@@ -61,6 +61,6 @@ namespace comphelper
 } // namespace comphelper
 //........................................................................
 
-#endif // _COMPHELPER_SYNCHRONOUSDISPATCH_HXX
+#endif // INCLUDED_COMPHELPER_SYNCHRONOUSDISPATCH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx
index 7ad9e2af6ab0..dc1631ac6d63 100644
--- a/include/comphelper/syntaxhighlight.hxx
+++ b/include/comphelper/syntaxhighlight.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 _COMPHELPER_SYNTAXHIGHLIGHT_HXX
-#define _COMPHELPER_SYNTAXHIGHLIGHT_HXX
+#ifndef INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX
+#define INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX
 
 #include <vector>
 #include <rtl/ustring.hxx>
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index f9a1506e88c6..8125f818c3d7 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_TYPES_HXX_
-#define _COMPHELPER_TYPES_HXX_
+#ifndef INCLUDED_COMPHELPER_TYPES_HXX
+#define INCLUDED_COMPHELPER_TYPES_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -169,6 +169,6 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_TYPES_HXX_
+#endif // INCLUDED_COMPHELPER_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx
index 1b83c73f4f25..7cf2ef8a6847 100644
--- a/include/comphelper/uno3.hxx
+++ b/include/comphelper/uno3.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_UNO3_HXX_
-#define _COMPHELPER_UNO3_HXX_
+#ifndef INCLUDED_COMPHELPER_UNO3_HXX
+#define INCLUDED_COMPHELPER_UNO3_HXX
 
 #include <osl/interlck.h>
 #include <rtl/instance.hxx>
@@ -270,6 +270,6 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif // _COMPHELPER_UNO3_HXX_
+#endif // INCLUDED_COMPHELPER_UNO3_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx
index c4885f3883d9..97ef629a31d3 100644
--- a/include/comphelper/unwrapargs.hxx
+++ b/include/comphelper/unwrapargs.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_UNWRAPARGS_HXX_INCLUDED
-#define COMPHELPER_UNWRAPARGS_HXX_INCLUDED
+#ifndef INCLUDED_COMPHELPER_UNWRAPARGS_HXX
+#define INCLUDED_COMPHELPER_UNWRAPARGS_HXX
 
 #include "rtl/ustrbuf.hxx"
 #include "com/sun/star/uno/Sequence.hxx"
@@ -133,6 +133,6 @@ BOOST_PP_REPEAT(COMPHELPER_UNWRAPARGS_MAX_ARGS, COMPHELPER_UNWRAPARGS_make, ~)
 
 } // namespace comphelper
 
-#endif //  ! defined(COMPHELPER_UNWRAPARGS_HXX_INCLUDED)
+#endif //  ! defined( INCLUDED_COMPHELPER_UNWRAPARGS_HXX)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx
index 126078adbf59..633f334fedba 100644
--- a/include/comphelper/weak.hxx
+++ b/include/comphelper/weak.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 _COMPHELPER_WEAK_HXX_
-#define _COMPHELPER_WEAK_HXX_
+#ifndef INCLUDED_COMPHELPER_WEAK_HXX
+#define INCLUDED_COMPHELPER_WEAK_HXX
 
 #include "comphelper/comphelperdllapi.h"
 
diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index 33defc8a36c9..608d75ba3c60 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPHELPER_WEAKEVENTLISTENER_HXX
-#define COMPHELPER_WEAKEVENTLISTENER_HXX
+#ifndef INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX
+#define INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX
 
 #include <cppuhelper/compbase1.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -176,7 +176,7 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#endif// COMPHELPER_WEAKEVENTLISTENER_HXX
+#endif // INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/xmltools.hxx b/include/comphelper/xmltools.hxx
index d8287dd4a89b..5f5bec9b94ad 100644
--- a/include/comphelper/xmltools.hxx
+++ b/include/comphelper/xmltools.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _XMLCHAFF_HXX
-#define _XMLCHAFF_HXX
+#ifndef INCLUDED_COMPHELPER_XMLTOOLS_HXX
+#define INCLUDED_COMPHELPER_XMLTOOLS_HXX
 
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/include/connectivity/BlobHelper.hxx b/include/connectivity/BlobHelper.hxx
index 6788a17b10df..3306851af114 100644
--- a/include/connectivity/BlobHelper.hxx
+++ b/include/connectivity/BlobHelper.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 _CONNECTIVITY_BLOBHELPER_HXX_
-#define _CONNECTIVITY_BLOBHELPER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_BLOBHELPER_HXX
+#define INCLUDED_CONNECTIVITY_BLOBHELPER_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include <com/sun/star/sdbc/XBlob.hpp>
@@ -39,6 +39,6 @@ namespace connectivity
     };
 }
 
-#endif //_CONNECTIVITY_BLOBHELPER_HXX_
+#endif // INCLUDED_CONNECTIVITY_BLOBHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx
index 617cd9421ab6..34d307a4fdc2 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.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 _CONNECTIVITY_COMMONTOOLS_HXX_
-#define _CONNECTIVITY_COMMONTOOLS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX
+#define INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX
 
 #include <config_features.h>
 
@@ -205,6 +205,6 @@ namespace connectivity
 
 //==================================================================================
 
-#endif // _CONNECTIVITY_COMMONTOOLS_HXX_
+#endif // INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx
index 84a828800a9c..2e0ed723c91d 100644
--- a/include/connectivity/ConnectionWrapper.hxx
+++ b/include/connectivity/ConnectionWrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_ZCONNECTIONWRAPPER_HXX_
-#define _CONNECTIVITY_ZCONNECTIONWRAPPER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_CONNECTIONWRAPPER_HXX
+#define INCLUDED_CONNECTIVITY_CONNECTIONWRAPPER_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -87,6 +87,6 @@ namespace connectivity
                     ,const OUString& _rPassword = OUString());
     };
 }
-#endif // _CONNECTIVITY_ZCONNECTIONWRAPPER_HXX_
+#endif // INCLUDED_CONNECTIVITY_CONNECTIONWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx
index 69c28cacbb02..0e58e72f2c1c 100644
--- a/include/connectivity/DriversConfig.hxx
+++ b/include/connectivity/DriversConfig.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 CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
-#define CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
+#ifndef INCLUDED_CONNECTIVITY_DRIVERSCONFIG_HXX
+#define INCLUDED_CONNECTIVITY_DRIVERSCONFIG_HXX
 
 #include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -75,6 +75,6 @@ namespace connectivity
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB;
     };
 }
-#endif // CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
+#endif // INCLUDED_CONNECTIVITY_DRIVERSCONFIG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index 34e73612bfa1..93187a0317b2 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_VALUE_HXX_
-#define _CONNECTIVITY_FILE_VALUE_HXX_
+#ifndef INCLUDED_CONNECTIVITY_FVALUE_HXX
+#define INCLUDED_CONNECTIVITY_FVALUE_HXX
 
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/uno/Any.hxx>
@@ -533,7 +533,7 @@ namespace connectivity
     typedef ::rtl::Reference< OValueRefVector >             OValueRefRow;
 }
 
-#endif // #ifndef _CONNECTIVITY_FILE_VALUE_HXX_
+#endif // INCLUDED_CONNECTIVITY_FVALUE_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx
index 0352ed8ec39f..78c901a94dda 100644
--- a/include/connectivity/IParseContext.hxx
+++ b/include/connectivity/IParseContext.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 CONNECTIVITY_IPARSECONTEXT_HXX
-#define CONNECTIVITY_IPARSECONTEXT_HXX
+#ifndef INCLUDED_CONNECTIVITY_IPARSECONTEXT_HXX
+#define INCLUDED_CONNECTIVITY_IPARSECONTEXT_HXX
 
 namespace connectivity { class OSQLParseNode; }
 
@@ -99,6 +99,6 @@ namespace connectivity
     };
 }
 
-#endif // CONNECTIVITY_IPARSECONTEXT_HXX
+#endif // INCLUDED_CONNECTIVITY_IPARSECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx
index a54cb809ca29..e26db36787c0 100644
--- a/include/connectivity/PColumn.hxx
+++ b/include/connectivity/PColumn.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 _CONNECTIVITY_PCOLUMN_HXX_
-#define _CONNECTIVITY_PCOLUMN_HXX_
+#ifndef INCLUDED_CONNECTIVITY_PCOLUMN_HXX
+#define INCLUDED_CONNECTIVITY_PCOLUMN_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include "connectivity/sdbcx/VColumn.hxx"
@@ -149,6 +149,6 @@ namespace connectivity
     }
 }
 
-#endif //_CONNECTIVITY_PCOLUMN_HXX_
+#endif // INCLUDED_CONNECTIVITY_PCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx
index 0c9c92ee4468..39b357b0cf81 100644
--- a/include/connectivity/ParameterCont.hxx
+++ b/include/connectivity/ParameterCont.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 CONNECTIVITY_PARAMETERCONTINUATION_HXX_INCLUDED
-#define CONNECTIVITY_PARAMETERCONTINUATION_HXX_INCLUDED
+#ifndef INCLUDED_CONNECTIVITY_PARAMETERCONT_HXX
+#define INCLUDED_CONNECTIVITY_PARAMETERCONT_HXX
 
 #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
 #include <comphelper/interaction.hxx>
@@ -47,6 +47,6 @@ namespace dbtools
         void operator =(const OParameterContinuation&);
     };
 } // dbtools
-#endif //CONNECTIVITY_PARAMETERCONTINUATION_HXX_INCLUDED
+#endif // INCLUDED_CONNECTIVITY_PARAMETERCONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/SQLStatementHelper.hxx b/include/connectivity/SQLStatementHelper.hxx
index 8302dae6b5c5..cc65140e960d 100644
--- a/include/connectivity/SQLStatementHelper.hxx
+++ b/include/connectivity/SQLStatementHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SQLSTATEMENTHELPER_HXX_
-#define _CONNECTIVITY_SQLSTATEMENTHELPER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SQLSTATEMENTHELPER_HXX
+#define INCLUDED_CONNECTIVITY_SQLSTATEMENTHELPER_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -38,6 +38,6 @@ namespace dbtools
 }   // namespace dbtools
 //.........................................................................
 
-#endif // _CONNECTIVITY_SQLSTATEMENTHELPER_HXX_
+#endif // INCLUDED_CONNECTIVITY_SQLSTATEMENTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/StdTypeDefs.hxx b/include/connectivity/StdTypeDefs.hxx
index 8751a656d2c0..32bf09ac3b47 100644
--- a/include/connectivity/StdTypeDefs.hxx
+++ b/include/connectivity/StdTypeDefs.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 CONNECTIVITY_STDTYPEDEFS_HXX
-#define CONNECTIVITY_STDTYPEDEFS_HXX
+#ifndef INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
+#define INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
 
 #include "sal/config.h"
 
@@ -35,6 +35,6 @@ namespace connectivity
     typedef ::std::map< sal_Int32,OUString>  TInt2StringMap;
 }
 
-#endif // CONNECTIVITY_STDTYPEDEFS_HXX
+#endif // INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx
index 5fe1dd0eb845..bc148ce87f20 100644
--- a/include/connectivity/TColumnsHelper.hxx
+++ b/include/connectivity/TColumnsHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_COLUMNSHELPER_HXX
-#define CONNECTIVITY_COLUMNSHELPER_HXX
+#ifndef INCLUDED_CONNECTIVITY_TCOLUMNSHELPER_HXX
+#define INCLUDED_CONNECTIVITY_TCOLUMNSHELPER_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -58,6 +58,6 @@ namespace connectivity
         inline void setParent(OTableHelper* _pTable) { m_pTable = _pTable;}
     };
 }
-#endif // CONNECTIVITY_COLUMNSHELPER_HXX
+#endif // INCLUDED_CONNECTIVITY_TCOLUMNSHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx
index b8502af9c5ec..e08fd305eb3e 100644
--- a/include/connectivity/TIndex.hxx
+++ b/include/connectivity/TIndex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_INDEXHELPER_HXX_
-#define CONNECTIVITY_INDEXHELPER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_TINDEX_HXX
+#define INCLUDED_CONNECTIVITY_TINDEX_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include "connectivity/sdbcx/VIndex.hxx"
@@ -44,6 +44,6 @@ namespace connectivity
         inline OTableHelper* getTable() const { return m_pTable; }
     };
 }
-#endif // CONNECTIVITY_INDEXHELPER_HXX_
+#endif // INCLUDED_CONNECTIVITY_TINDEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TIndexColumns.hxx b/include/connectivity/TIndexColumns.hxx
index 31b0ecfe3ca5..807c8362dd1d 100644
--- a/include/connectivity/TIndexColumns.hxx
+++ b/include/connectivity/TIndexColumns.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_INDEXCOLUMNSHELPER_HXX
-#define CONNECTIVITY_INDEXCOLUMNSHELPER_HXX
+#ifndef INCLUDED_CONNECTIVITY_TINDEXCOLUMNS_HXX
+#define INCLUDED_CONNECTIVITY_TINDEXCOLUMNS_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include "connectivity/dbtoolsdllapi.hxx"
@@ -39,6 +39,6 @@ namespace connectivity
                         const ::std::vector< OUString> &_rVector);
     };
 }
-#endif // CONNECTIVITY_INDEXCOLUMNSHELPER_HXX
+#endif // INCLUDED_CONNECTIVITY_TINDEXCOLUMNS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TIndexes.hxx b/include/connectivity/TIndexes.hxx
index c558c709c8e8..b150b661eb25 100644
--- a/include/connectivity/TIndexes.hxx
+++ b/include/connectivity/TIndexes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_INDEXESHELPER_HXX
-#define CONNECTIVITY_INDEXESHELPER_HXX
+#ifndef INCLUDED_CONNECTIVITY_TINDEXES_HXX
+#define INCLUDED_CONNECTIVITY_TINDEXES_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include "connectivity/sdbcx/VCollection.hxx"
@@ -45,6 +45,6 @@ namespace connectivity
     };
 }
 
-#endif // CONNECTIVITY_INDEXESHELPER_HXX
+#endif // INCLUDED_CONNECTIVITY_TINDEXES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx
index 9b24e41c3126..51b944cea6e4 100644
--- a/include/connectivity/TKey.hxx
+++ b/include/connectivity/TKey.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_TKEY_HXX
-#define CONNECTIVITY_TKEY_HXX
+#ifndef INCLUDED_CONNECTIVITY_TKEY_HXX
+#define INCLUDED_CONNECTIVITY_TKEY_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include <connectivity/sdbcx/VKey.hxx>
@@ -41,7 +41,7 @@ namespace connectivity
         inline OTableHelper* getTable() const { return m_pTable; }
     };
 }
-#endif // CONNECTIVITY_TKEY_HXX
+#endif // INCLUDED_CONNECTIVITY_TKEY_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TKeyColumns.hxx b/include/connectivity/TKeyColumns.hxx
index 6dbb041805b4..f4d112aa7414 100644
--- a/include/connectivity/TKeyColumns.hxx
+++ b/include/connectivity/TKeyColumns.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_TKEYCOLUMNS_HXX
-#define CONNECTIVITY_TKEYCOLUMNS_HXX
+#ifndef INCLUDED_CONNECTIVITY_TKEYCOLUMNS_HXX
+#define INCLUDED_CONNECTIVITY_TKEYCOLUMNS_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include "connectivity/TKey.hxx"
@@ -39,6 +39,6 @@ namespace connectivity
                         const ::std::vector< OUString> &_rVector);
     };
 }
-#endif // CONNECTIVITY_TKEYCOLUMNS_HXX
+#endif // INCLUDED_CONNECTIVITY_TKEYCOLUMNS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TKeys.hxx b/include/connectivity/TKeys.hxx
index 817b24da3a42..0cd6e53df4fb 100644
--- a/include/connectivity/TKeys.hxx
+++ b/include/connectivity/TKeys.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_TKEYS_HXX
-#define CONNECTIVITY_TKEYS_HXX
+#ifndef INCLUDED_CONNECTIVITY_TKEYS_HXX
+#define INCLUDED_CONNECTIVITY_TKEYS_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -54,6 +54,6 @@ namespace connectivity
     };
 }
 
-#endif // CONNECTIVITY_TKEYS_HXX
+#endif // INCLUDED_CONNECTIVITY_TKEYS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx
index aeb58cb4dd0c..e2660d8ae864 100644
--- a/include/connectivity/TTableHelper.hxx
+++ b/include/connectivity/TTableHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_TABLEHELPER_HXX
-#define CONNECTIVITY_TABLEHELPER_HXX
+#ifndef INCLUDED_CONNECTIVITY_TTABLEHELPER_HXX
+#define INCLUDED_CONNECTIVITY_TTABLEHELPER_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include "connectivity/sdbcx/VTable.hxx"
@@ -161,6 +161,6 @@ namespace connectivity
         ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XIndexAlteration>  getIndexService() const;
     };
 }
-#endif // CONNECTIVITY_TABLEHELPER_HXX
+#endif // INCLUDED_CONNECTIVITY_TTABLEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx
index 1eec5ac50f98..ecfd7e885d3e 100644
--- a/include/connectivity/conncleanup.hxx
+++ b/include/connectivity/conncleanup.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_CONNCLEANUP_HXX_
-#define _CONNECTIVITY_CONNCLEANUP_HXX_
+#ifndef INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX
+#define INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -85,6 +85,6 @@ namespace dbtools
 }   // namespace dbtools
 //.........................................................................
 
-#endif // _CONNECTIVITY_CONNCLEANUP_HXX_
+#endif // INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx
index 712c44abddb4..22b0a4889095 100644
--- a/include/connectivity/dbcharset.hxx
+++ b/include/connectivity/dbcharset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBHELPER_DBCHARSET_HXX_
-#define _DBHELPER_DBCHARSET_HXX_
+#ifndef INCLUDED_CONNECTIVITY_DBCHARSET_HXX
+#define INCLUDED_CONNECTIVITY_DBCHARSET_HXX
 
 #include "sal/config.h"
 
@@ -159,6 +159,6 @@ namespace dbtools
 }   // namespace dbtools
 //.........................................................................
 
-#endif // _DBHELPER_DBCHARSET_HXX_
+#endif // INCLUDED_CONNECTIVITY_DBCHARSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx
index d579d0e61a80..6064b65c575f 100644
--- a/include/connectivity/dbconversion.hxx
+++ b/include/connectivity/dbconversion.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBHELPER_DBCONVERSION_HXX_
-#define _DBHELPER_DBCONVERSION_HXX_
+#ifndef INCLUDED_CONNECTIVITY_DBCONVERSION_HXX
+#define INCLUDED_CONNECTIVITY_DBCONVERSION_HXX
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/util/Date.hpp>
@@ -204,6 +204,6 @@ namespace dbtools
 }   // namespace dbtools
 //.........................................................................
 
-#endif // _DBHELPER_DBCONVERSION_HXX_
+#endif // INCLUDED_CONNECTIVITY_DBCONVERSION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx
index b43e32b3344b..feeb7a5de273 100644
--- a/include/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBHELPER_DBEXCEPTION_HXX_
-#define _DBHELPER_DBEXCEPTION_HXX_
+#ifndef INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX
+#define INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX
 
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include "connectivity/standardsqlstate.hxx"
@@ -328,7 +328,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
 }   // namespace dbtools
 //.........................................................................
 
-#endif // _DBHELPER_DBEXCEPTION_HXX_
+#endif // INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx
index 06fcc62f548d..c1ee8feef06a 100644
--- a/include/connectivity/dbmetadata.hxx
+++ b/include/connectivity/dbmetadata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX
-#define CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX
+#ifndef INCLUDED_CONNECTIVITY_DBMETADATA_HXX
+#define INCLUDED_CONNECTIVITY_DBMETADATA_HXX
 
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -183,6 +183,6 @@ namespace dbtools
 } // namespace dbtools
 //........................................................................
 
-#endif // CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX
+#endif // INCLUDED_CONNECTIVITY_DBMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index e584e351795c..0b2bc2f5249d 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
-#define _CONNECTIVITY_DBTOOLS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_DBTOOLS_HXX
+#define INCLUDED_CONNECTIVITY_DBTOOLS_HXX
 
 #include <connectivity/dbexception.hxx>
 #include <comphelper/types.hxx>
@@ -795,6 +795,6 @@ namespace dbtools
 }   // namespace dbtools
 //.........................................................................
 
-#endif // _CONNECTIVITY_DBTOOLS_HXX_
+#endif // INCLUDED_CONNECTIVITY_DBTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx
index a8717f628ed6..36afa9a13473 100644
--- a/include/connectivity/filtermanager.hxx
+++ b/include/connectivity/filtermanager.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 CONNECTIVITY_FILTERMANAGER_HXX
-#define CONNECTIVITY_FILTERMANAGER_HXX
+#ifndef INCLUDED_CONNECTIVITY_FILTERMANAGER_HXX
+#define INCLUDED_CONNECTIVITY_FILTERMANAGER_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/XSQLQueryComposer.hpp>
diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx
index 79e422804351..92a30cb1bf59 100644
--- a/include/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
-#define CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
+#ifndef INCLUDED_CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
+#define INCLUDED_CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
@@ -104,6 +104,6 @@ namespace dbtools
 } // namespace dbtools
 //........................................................................
 
-#endif // CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
+#endif // INCLUDED_CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/internalnode.hxx b/include/connectivity/internalnode.hxx
index 773ba52a93d6..5462aef5ba6f 100644
--- a/include/connectivity/internalnode.hxx
+++ b/include/connectivity/internalnode.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 _CONNECTIVITY_SQLINTERNALNODE_HXX
-#define _CONNECTIVITY_SQLINTERNALNODE_HXX
+#ifndef INCLUDED_CONNECTIVITY_INTERNALNODE_HXX
+#define INCLUDED_CONNECTIVITY_INTERNALNODE_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include <connectivity/sqlnode.hxx>
@@ -46,6 +46,6 @@ namespace connectivity
     };
 }
 
-#endif  //_CONNECTIVITY_SQLINTERNALNODE_HXX
+#endif // INCLUDED_CONNECTIVITY_INTERNALNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx
index 9bdbe0e5c3fb..92a23a874b7f 100644
--- a/include/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.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 CONNECTIVITY_PARAMETERS_HXX
-#define CONNECTIVITY_PARAMETERS_HXX
+#ifndef INCLUDED_CONNECTIVITY_PARAMETERS_HXX
+#define INCLUDED_CONNECTIVITY_PARAMETERS_HXX
 
 #include <map>
 #include <vector>
@@ -412,6 +412,6 @@ namespace dbtools
 } // namespacefrm
 //........................................................................
 
-#endif // CONNECTIVITY_PARAMETERS_HXX
+#endif // INCLUDED_CONNECTIVITY_PARAMETERS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index 69347e9c4e6d..95f29b02df9e 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_PARAMWRAPPER_HXX
-#define CONNECTIVITY_PARAMWRAPPER_HXX
+#ifndef INCLUDED_CONNECTIVITY_PARAMWRAPPER_HXX
+#define INCLUDED_CONNECTIVITY_PARAMWRAPPER_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include <connectivity/FValue.hxx>
@@ -195,6 +195,6 @@ namespace param
 } } // namespace dbtools::param
 //........................................................................
 
-#endif // CONNECTIVITY_PARAMWRAPPER_HXX
+#endif // INCLUDED_CONNECTIVITY_PARAMWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx
index 629419c9719d..cdd5735bcfbc 100644
--- a/include/connectivity/predicateinput.hxx
+++ b/include/connectivity/predicateinput.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_PREDICATEINPUT_HXX
-#define CONNECTIVITY_PREDICATEINPUT_HXX
+#ifndef INCLUDED_CONNECTIVITY_PREDICATEINPUT_HXX
+#define INCLUDED_CONNECTIVITY_PREDICATEINPUT_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -120,6 +120,6 @@ namespace dbtools
 }   // namespace dbtools
 //.........................................................................
 
-#endif // CONNECTIVITY_PREDICATEINPUT_HXX
+#endif // INCLUDED_CONNECTIVITY_PREDICATEINPUT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/IRefreshable.hxx b/include/connectivity/sdbcx/IRefreshable.hxx
index 629b2b3137b5..e0bc837d533c 100644
--- a/include/connectivity/sdbcx/IRefreshable.hxx
+++ b/include/connectivity/sdbcx/IRefreshable.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 _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_
-#define _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_IREFRESHABLE_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_IREFRESHABLE_HXX
 
 #include "connectivity/CommonTools.hxx"
 #include "connectivity/dbtoolsdllapi.hxx"
@@ -54,6 +54,6 @@ namespace connectivity
         };
     }
 }
-#endif //_CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_IREFRESHABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx
index 14840400b385..a071a6a358a4 100644
--- a/include/connectivity/sdbcx/VCatalog.hxx
+++ b/include/connectivity/sdbcx/VCatalog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_CATALOG_HXX_
-#define _CONNECTIVITY_SDBCX_CATALOG_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VCATALOG_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VCATALOG_HXX
 
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
@@ -120,6 +120,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_SDBCX_CATALOG_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VCATALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index e30075f009e9..aa38684d96c7 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
-#define _CONNECTIVITY_SDBCX_COLLECTION_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VCOLLECTION_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VCOLLECTION_HXX
 
 #include <cppuhelper/implbase10.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -231,7 +231,7 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_SDBCX_COLLECTION_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VCOLLECTION_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx
index 42cddc51c041..2a389d9478b0 100644
--- a/include/connectivity/sdbcx/VColumn.hxx
+++ b/include/connectivity/sdbcx/VColumn.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 _CONNECTIVITY_SDBCX_COLUMN_HXX_
-#define _CONNECTIVITY_SDBCX_COLUMN_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VCOLUMN_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VCOLUMN_HXX
 
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/container/XNamed.hpp>
@@ -113,6 +113,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_SDBCX_COLUMN_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx
index aa04b5229ac9..3c39a46613ba 100644
--- a/include/connectivity/sdbcx/VDescriptor.hxx
+++ b/include/connectivity/sdbcx/VDescriptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_
-#define _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VDESCRIPTOR_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VDESCRIPTOR_HXX
 
 #include <comphelper/propertycontainer.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -90,6 +90,6 @@ namespace connectivity
     }
 
 }
-#endif // _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VDESCRIPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx
index 6e4ba2355d62..6a1c5857788a 100644
--- a/include/connectivity/sdbcx/VGroup.hxx
+++ b/include/connectivity/sdbcx/VGroup.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_GROUP_HXX_
-#define _CONNECTIVITY_SDBCX_GROUP_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VGROUP_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VGROUP_HXX
 
 #include <osl/diagnose.h>
 
@@ -97,7 +97,7 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_SDBCX_GROUP_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VGROUP_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx
index 3e50ddf9459c..33d73e1010ee 100644
--- a/include/connectivity/sdbcx/VIndex.hxx
+++ b/include/connectivity/sdbcx/VIndex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_INDEX_HXX_
-#define _CONNECTIVITY_SDBCX_INDEX_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VINDEX_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VINDEX_HXX
 
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
@@ -101,6 +101,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_SDBCX_INDEX_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VINDEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VIndexColumn.hxx b/include/connectivity/sdbcx/VIndexColumn.hxx
index a4de9e6bf5bd..7b55a8f3eb0d 100644
--- a/include/connectivity/sdbcx/VIndexColumn.hxx
+++ b/include/connectivity/sdbcx/VIndexColumn.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_INDEXCOLUMN_HXX_
-#define _CONNECTIVITY_SDBCX_INDEXCOLUMN_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VINDEXCOLUMN_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VINDEXCOLUMN_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include "connectivity/sdbcx/VColumn.hxx"
@@ -60,6 +60,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_SDBCX_INDEXCOLUMN_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VINDEXCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx
index 24d85dfb2614..21268c530165 100644
--- a/include/connectivity/sdbcx/VKey.hxx
+++ b/include/connectivity/sdbcx/VKey.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_KEY_HXX_
-#define _CONNECTIVITY_SDBCX_KEY_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VKEY_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VKEY_HXX
 
 
 #include <comphelper/IdPropArrayHelper.hxx>
@@ -115,7 +115,7 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_SDBCX_KEY_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VKEY_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx
index b22ea3247941..d106c3947fdc 100644
--- a/include/connectivity/sdbcx/VKeyColumn.hxx
+++ b/include/connectivity/sdbcx/VKeyColumn.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_KEYCOLUMN_HXX_
-#define _CONNECTIVITY_SDBCX_KEYCOLUMN_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VKEYCOLUMN_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VKEYCOLUMN_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include "connectivity/sdbcx/VColumn.hxx"
@@ -62,6 +62,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_SDBCX_KEYCOLUMN_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VKEYCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index 0be41a9cd22f..9f468fcf3fb2 100644
--- a/include/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_TABLE_HXX_
-#define _CONNECTIVITY_SDBCX_TABLE_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VTABLE_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VTABLE_HXX
 
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
@@ -136,6 +136,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_SDBCX_TABLE_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VTypeDef.hxx b/include/connectivity/sdbcx/VTypeDef.hxx
index 08019f9174da..c931a57b61df 100644
--- a/include/connectivity/sdbcx/VTypeDef.hxx
+++ b/include/connectivity/sdbcx/VTypeDef.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_TYPEDEF_HXX_
-#define _CONNECTIVITY_SDBCX_TYPEDEF_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX
 
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <cppuhelper/compbase3.hxx>
@@ -35,6 +35,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_SDBCX_TYPEDEF_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx
index 01bafc0d177c..344d02a9a8b9 100644
--- a/include/connectivity/sdbcx/VUser.hxx
+++ b/include/connectivity/sdbcx/VUser.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_USER_HXX_
-#define _CONNECTIVITY_SDBCX_USER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VUSER_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VUSER_HXX
 
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbcx/XUser.hpp>
@@ -95,6 +95,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_SDBCX_USER_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VUSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index 6134ddc4bb69..e9f293a3f6f7 100644
--- a/include/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_SDBCX_VIEW_HXX_
-#define _CONNECTIVITY_SDBCX_VIEW_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SDBCX_VVIEW_HXX
+#define INCLUDED_CONNECTIVITY_SDBCX_VVIEW_HXX
 
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
@@ -96,6 +96,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_SDBCX_VIEW_HXX_
+#endif // INCLUDED_CONNECTIVITY_SDBCX_VVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sqlbison_exports.hxx b/include/connectivity/sqlbison_exports.hxx
index 38fa786402ea..ad8d011fd68a 100644
--- a/include/connectivity/sqlbison_exports.hxx
+++ b/include/connectivity/sqlbison_exports.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _CONNECTIVITY_PARSE_SQLBISON_HXX_
-#define _CONNECTIVITY_PARSE_SQLBISON_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX
+#define INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -18,6 +18,6 @@ OUString ConvertLikeToken(const ::connectivity::OSQLParseNode* pTokenNode, const
 int SQLyyparse (void);
 void setParser( ::connectivity::OSQLParser* );
 
-#endif //_CONNECTIVITY_PARSE_SQLBISON_HXX_
+#endif // INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx
index 0d6ff02d9108..f23ab4c143a1 100644
--- a/include/connectivity/sqlerror.hxx
+++ b/include/connectivity/sqlerror.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_SQLERROR_HXX
-#define CONNECTIVITY_SQLERROR_HXX
+#ifndef INCLUDED_CONNECTIVITY_SQLERROR_HXX
+#define INCLUDED_CONNECTIVITY_SQLERROR_HXX
 
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -312,6 +312,6 @@ namespace connectivity
 } // namespace connectivity
 //........................................................................
 
-#endif // CONNECTIVITY_SQLERROR_HXX
+#endif // INCLUDED_CONNECTIVITY_SQLERROR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 03b12de251f9..24a10f317ed9 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.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 _CONNECTIVITY_PARSE_SQLITERATOR_HXX_
-#define _CONNECTIVITY_PARSE_SQLITERATOR_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SQLITERATOR_HXX
+#define INCLUDED_CONNECTIVITY_SQLITERATOR_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include "connectivity/sqlnode.hxx"
@@ -362,6 +362,6 @@ namespace connectivity
     };
 }
 
-#endif // _CONNECTIVITY_PARSE_SQLITERATOR_HXX_
+#endif // INCLUDED_CONNECTIVITY_SQLITERATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index f0fe1acdd6e9..546c32d5c5c4 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.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 _CONNECTIVITY_SQLNODE_HXX
-#define _CONNECTIVITY_SQLNODE_HXX
+#ifndef INCLUDED_CONNECTIVITY_SQLNODE_HXX
+#define INCLUDED_CONNECTIVITY_SQLNODE_HXX
 
 #include "connectivity/dbtoolsdllapi.hxx"
 #include "connectivity/dbmetadata.hxx"
@@ -465,6 +465,6 @@ namespace connectivity
     #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && !(pParseNode)->getTokenValue().compareToAscii(aString))
 }
 
-#endif  //_CONNECTIVITY_SQLNODE_HXX
+#endif // INCLUDED_CONNECTIVITY_SQLNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index 33884e5e2a71..c64ab28c7623 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.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 _CONNECTIVITY_SQLPARSE_HXX
-#define _CONNECTIVITY_SQLPARSE_HXX
+#ifndef INCLUDED_CONNECTIVITY_SQLPARSE_HXX
+#define INCLUDED_CONNECTIVITY_SQLPARSE_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <osl/mutex.hxx>
@@ -248,6 +248,6 @@ namespace connectivity
 }
 
 
-#endif //_CONNECTIVITY_SQLPARSE_HXX
+#endif // INCLUDED_CONNECTIVITY_SQLPARSE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index cf881c561630..0389c96851fb 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.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 _CONNECTIVITY_SQLSCAN_HXX
-#define _CONNECTIVITY_SQLSCAN_HXX
+#ifndef INCLUDED_CONNECTIVITY_SQLSCAN_HXX
+#define INCLUDED_CONNECTIVITY_SQLSCAN_HXX
 
 #include <stdarg.h>
 #include "connectivity/IParseContext.hxx"
diff --git a/include/connectivity/standardsqlstate.hxx b/include/connectivity/standardsqlstate.hxx
index fb896d1a8af8..757a98cb6583 100644
--- a/include/connectivity/standardsqlstate.hxx
+++ b/include/connectivity/standardsqlstate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_STANDARD_SQL_STATE_HXX
-#define CONNECTIVITY_STANDARD_SQL_STATE_HXX
+#ifndef INCLUDED_CONNECTIVITY_STANDARDSQLSTATE_HXX
+#define INCLUDED_CONNECTIVITY_STANDARDSQLSTATE_HXX
 
 //.........................................................................
 namespace dbtools
@@ -63,6 +63,6 @@ namespace dbtools
 }   // namespace dbtools
 //.........................................................................
 
-#endif // CONNECTIVITY_STANDARD_SQL_STATE_HXX
+#endif // INCLUDED_CONNECTIVITY_STANDARDSQLSTATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx
index 56b10ebd0d11..bb3392dd6c20 100644
--- a/include/connectivity/statementcomposer.hxx
+++ b/include/connectivity/statementcomposer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_STATEMENTCOMPOSER_HXX
-#define CONNECTIVITY_STATEMENTCOMPOSER_HXX
+#ifndef INCLUDED_CONNECTIVITY_STATEMENTCOMPOSER_HXX
+#define INCLUDED_CONNECTIVITY_STATEMENTCOMPOSER_HXX
 
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
@@ -97,6 +97,6 @@ namespace dbtools
 } // namespace dbtools
 //........................................................................
 
-#endif // CONNECTIVITY_STATEMENTCOMPOSER_HXX
+#endif // INCLUDED_CONNECTIVITY_STATEMENTCOMPOSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx
index fc14662c4dcf..fb34a0e43f97 100644
--- a/include/connectivity/virtualdbtools.hxx
+++ b/include/connectivity/virtualdbtools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_VIRTUAL_DBTOOLS_HXX
-#define CONNECTIVITY_VIRTUAL_DBTOOLS_HXX
+#ifndef INCLUDED_CONNECTIVITY_VIRTUALDBTOOLS_HXX
+#define INCLUDED_CONNECTIVITY_VIRTUALDBTOOLS_HXX
 
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
@@ -363,6 +363,6 @@ namespace connectivity
 }   // namespace connectivity
 //........................................................................
 
-#endif // CONNECTIVITY_VIRTUAL_DBTOOLS_HXX
+#endif // INCLUDED_CONNECTIVITY_VIRTUALDBTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/warningscontainer.hxx b/include/connectivity/warningscontainer.hxx
index 5a013f9a5145..c8a3268edae8 100644
--- a/include/connectivity/warningscontainer.hxx
+++ b/include/connectivity/warningscontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBTOOLS_WARNINGSCONTAINER_HXX
-#define DBTOOLS_WARNINGSCONTAINER_HXX
+#ifndef INCLUDED_CONNECTIVITY_WARNINGSCONTAINER_HXX
+#define INCLUDED_CONNECTIVITY_WARNINGSCONTAINER_HXX
 
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
@@ -97,6 +97,6 @@ namespace dbtools
 }   // namespace dbtools
 //.........................................................................
 
-#endif // DBTOOLS_WARNINGSCONTAINER_HXX
+#endif // INCLUDED_CONNECTIVITY_WARNINGSCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/basegfxfactory.hxx b/include/cppcanvas/basegfxfactory.hxx
index 83acb38c448f..de958efc7875 100644
--- a/include/cppcanvas/basegfxfactory.hxx
+++ b/include/cppcanvas/basegfxfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_BASEGFXFACTORY_HXX
-#define _CPPCANVAS_BASEGFXFACTORY_HXX
+#ifndef INCLUDED_CPPCANVAS_BASEGFXFACTORY_HXX
+#define INCLUDED_CPPCANVAS_BASEGFXFACTORY_HXX
 
 #include <cppcanvas/canvas.hxx>
 #include <cppcanvas/bitmapcanvas.hxx>
@@ -84,6 +84,6 @@ namespace cppcanvas
 
 }
 
-#endif /* _CPPCANVAS_BASEGFXFACTORY_HXX */
+#endif // INCLUDED_CPPCANVAS_BASEGFXFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx
index 5e542e7220aa..12eed6e30e8d 100644
--- a/include/cppcanvas/bitmap.hxx
+++ b/include/cppcanvas/bitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_BITMAP_HXX
-#define _CPPCANVAS_BITMAP_HXX
+#ifndef INCLUDED_CPPCANVAS_BITMAP_HXX
+#define INCLUDED_CPPCANVAS_BITMAP_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -69,6 +69,6 @@ namespace cppcanvas
     typedef ::boost::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr;
 }
 
-#endif /* _CPPCANVAS_BITMAP_HXX */
+#endif // INCLUDED_CPPCANVAS_BITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/bitmapcanvas.hxx b/include/cppcanvas/bitmapcanvas.hxx
index 620182a14e45..714879230ab9 100644
--- a/include/cppcanvas/bitmapcanvas.hxx
+++ b/include/cppcanvas/bitmapcanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_BITMAPCANVAS_HXX
-#define _CPPCANVAS_BITMAPCANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX
+#define INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
@@ -55,6 +55,6 @@ namespace cppcanvas
 
 }
 
-#endif /* _CPPCANVAS_BITMAPCANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx
index 0a77e7129a43..9b5ce34c3336 100644
--- a/include/cppcanvas/canvas.hxx
+++ b/include/cppcanvas/canvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_CANVAS_HXX
-#define _CPPCANVAS_CANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_CANVAS_HXX
+#define INCLUDED_CPPCANVAS_CANVAS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -101,6 +101,6 @@ namespace cppcanvas
 
 }
 
-#endif /* _CPPCANVAS_CANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_CANVAS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx
index e496df6aeb33..ca3db47be9e1 100644
--- a/include/cppcanvas/canvasgraphic.hxx
+++ b/include/cppcanvas/canvasgraphic.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_CANVASGRAPHIC_HXX
-#define _CPPCANVAS_CANVASGRAPHIC_HXX
+#ifndef INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX
+#define INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX
 
 #include <sal/types.h>
 
@@ -152,6 +152,6 @@ namespace cppcanvas
     typedef ::boost::shared_ptr< ::cppcanvas::CanvasGraphic > CanvasGraphicSharedPtr;
 }
 
-#endif /* _CPPCANVAS_CANVASGRAPHIC_HXX */
+#endif // INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/color.hxx b/include/cppcanvas/color.hxx
index 6d7dc957286a..f259fa1ee176 100644
--- a/include/cppcanvas/color.hxx
+++ b/include/cppcanvas/color.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_COLOR_HXX
-#define _CPPCANVAS_COLOR_HXX
+#ifndef INCLUDED_CPPCANVAS_COLOR_HXX
+#define INCLUDED_CPPCANVAS_COLOR_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -84,6 +84,6 @@ namespace cppcanvas
 
 }
 
-#endif /* _CPPCANVAS_COLOR_HXX */
+#endif // INCLUDED_CPPCANVAS_COLOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/customsprite.hxx b/include/cppcanvas/customsprite.hxx
index 70004e7e5900..2b810ebfdaa7 100644
--- a/include/cppcanvas/customsprite.hxx
+++ b/include/cppcanvas/customsprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_CUSTOMSPRITE_HXX
-#define _CPPCANVAS_CUSTOMSPRITE_HXX
+#ifndef INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX
+#define INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX
 
 #include <sal/types.h>
 
@@ -42,6 +42,6 @@ namespace cppcanvas
     typedef ::boost::shared_ptr< ::cppcanvas::CustomSprite > CustomSpriteSharedPtr;
 }
 
-#endif /* _CPPCANVAS_CUSTOMSPRITE_HXX */
+#endif // INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/font.hxx b/include/cppcanvas/font.hxx
index 967903eaa8e7..c7d8ad6e600e 100644
--- a/include/cppcanvas/font.hxx
+++ b/include/cppcanvas/font.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_FONT_HXX
-#define _CPPCANVAS_FONT_HXX
+#ifndef INCLUDED_CPPCANVAS_FONT_HXX
+#define INCLUDED_CPPCANVAS_FONT_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -50,6 +50,6 @@ namespace cppcanvas
     typedef ::boost::shared_ptr< ::cppcanvas::Font > FontSharedPtr;
 }
 
-#endif /* _CPPCANVAS_FONT_HXX */
+#endif // INCLUDED_CPPCANVAS_FONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx
index ccfbb95d3def..1db71e276a74 100644
--- a/include/cppcanvas/polypolygon.hxx
+++ b/include/cppcanvas/polypolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_POLYPOLYGON_HXX
-#define _CPPCANVAS_POLYPOLYGON_HXX
+#ifndef INCLUDED_CPPCANVAS_POLYPOLYGON_HXX
+#define INCLUDED_CPPCANVAS_POLYPOLYGON_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -82,6 +82,6 @@ namespace cppcanvas
     typedef ::boost::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr;
 }
 
-#endif /* _CPPCANVAS_POLYPOLYGON_HXX */
+#endif // INCLUDED_CPPCANVAS_POLYPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/renderer.hxx b/include/cppcanvas/renderer.hxx
index e260e9400248..8d51071ba116 100644
--- a/include/cppcanvas/renderer.hxx
+++ b/include/cppcanvas/renderer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_RENDERER_HXX
-#define _CPPCANVAS_RENDERER_HXX
+#ifndef INCLUDED_CPPCANVAS_RENDERER_HXX
+#define INCLUDED_CPPCANVAS_RENDERER_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -139,6 +139,6 @@ namespace cppcanvas
     typedef ::boost::shared_ptr< ::cppcanvas::Renderer > RendererSharedPtr;
 }
 
-#endif /* _CPPCANVAS_RENDERER_HXX */
+#endif // INCLUDED_CPPCANVAS_RENDERER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx
index 0e87ff9b9dd1..3074ab515cce 100644
--- a/include/cppcanvas/sprite.hxx
+++ b/include/cppcanvas/sprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_SPRITE_HXX
-#define _CPPCANVAS_SPRITE_HXX
+#ifndef INCLUDED_CPPCANVAS_SPRITE_HXX
+#define INCLUDED_CPPCANVAS_SPRITE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -105,6 +105,6 @@ namespace cppcanvas
     typedef ::boost::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr;
 }
 
-#endif /* _CPPCANVAS_SPRITE_HXX */
+#endif // INCLUDED_CPPCANVAS_SPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx
index 75732448e819..91fc52b3cc41 100644
--- a/include/cppcanvas/spritecanvas.hxx
+++ b/include/cppcanvas/spritecanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_SPRITECANVAS_HXX
-#define _CPPCANVAS_SPRITECANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_SPRITECANVAS_HXX
+#define INCLUDED_CPPCANVAS_SPRITECANVAS_HXX
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
@@ -71,6 +71,6 @@ namespace cppcanvas
 
 }
 
-#endif /* _CPPCANVAS_SPRITECANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_SPRITECANVAS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/text.hxx b/include/cppcanvas/text.hxx
index 4ca53532c282..b25a1e6ad9fa 100644
--- a/include/cppcanvas/text.hxx
+++ b/include/cppcanvas/text.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_TEXT_HXX
-#define _CPPCANVAS_TEXT_HXX
+#ifndef INCLUDED_CPPCANVAS_TEXT_HXX
+#define INCLUDED_CPPCANVAS_TEXT_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <cppcanvas/canvasgraphic.hxx>
@@ -40,6 +40,6 @@ namespace cppcanvas
     typedef ::boost::shared_ptr< ::cppcanvas::Text > TextSharedPtr;
 }
 
-#endif /* _CPPCANVAS_TEXT_HXX */
+#endif // INCLUDED_CPPCANVAS_TEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx
index b5d2f9612be9..3b2b49826393 100644
--- a/include/cppcanvas/vclfactory.hxx
+++ b/include/cppcanvas/vclfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_VCLFACTORY_HXX
-#define _CPPCANVAS_VCLFACTORY_HXX
+#ifndef INCLUDED_CPPCANVAS_VCLFACTORY_HXX
+#define INCLUDED_CPPCANVAS_VCLFACTORY_HXX
 
 #include <cppcanvas/canvas.hxx>
 #include <cppcanvas/bitmapcanvas.hxx>
@@ -97,6 +97,6 @@ namespace cppcanvas
 
 }
 
-#endif /* _CPPCANVAS_VCLFACTORY_HXX */
+#endif // INCLUDED_CPPCANVAS_VCLFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppu/cppudllapi.h b/include/cppu/cppudllapi.h
index ee37e1b1c399..c2bcc559bbea 100644
--- a/include/cppu/cppudllapi.h
+++ b/include/cppu/cppudllapi.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef INCLUDED_CPPUDLLAPI_H
-#define INCLUDED_CPPUDLLAPI_H
+#ifndef INCLUDED_CPPU_CPPUDLLAPI_H
+#define INCLUDED_CPPU_CPPUDLLAPI_H
 
 #include "sal/types.h"
 
@@ -16,6 +16,6 @@
 #define PURPENV_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 
-#endif /* INCLUDED_CPPUDLLAPI_H */
+#endif // INCLUDED_CPPU_CPPUDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppu/macros.hxx b/include/cppu/macros.hxx
index ecaa1470893b..86c2b1ead9ba 100644
--- a/include/cppu/macros.hxx
+++ b/include/cppu/macros.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 _CPPU_MACROS_HXX_
-#define _CPPU_MACROS_HXX_
+#ifndef INCLUDED_CPPU_MACROS_HXX
+#define INCLUDED_CPPU_MACROS_HXX
 
 #include <sal/types.h>
 #include <uno/lbnames.h>
@@ -53,6 +53,6 @@
 
 /// @endcond
 
-#endif  // _CPPU_MACROS_HXX_
+#endif // INCLUDED_CPPU_MACROS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx
index f1fbe3f13cd6..19078e95d217 100644
--- a/include/cppuhelper/access_control.hxx
+++ b/include/cppuhelper/access_control.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 _CPPUHELPER_ACCESS_CONTROL_HXX_
-#define _CPPUHELPER_ACCESS_CONTROL_HXX_
+#ifndef INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX
+#define INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/security/XAccessController.hpp>
diff --git a/include/cppuhelper/basemutex.hxx b/include/cppuhelper/basemutex.hxx
index 5394b834e434..48c4aa49a501 100644
--- a/include/cppuhelper/basemutex.hxx
+++ b/include/cppuhelper/basemutex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPUHELPER_BASEMUTEX_HXX_
-#define _CPPUHELPER_BASEMUTEX_HXX_
+#ifndef INCLUDED_CPPUHELPER_BASEMUTEX_HXX
+#define INCLUDED_CPPUHELPER_BASEMUTEX_HXX
 
 #include <osl/mutex.hxx>
 
@@ -38,6 +38,6 @@ namespace cppu
         mutable ::osl::Mutex m_aMutex;
     };
 }
-#endif // _CPPUHELPER_BASEMUTEX_HXX_
+#endif // INCLUDED_CPPUHELPER_BASEMUTEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx
index d76379a2f3e3..080d66966fa3 100644
--- a/include/cppuhelper/bootstrap.hxx
+++ b/include/cppuhelper/bootstrap.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 _CPPUHELPER_BOOTSTRAP_HXX_
-#define _CPPUHELPER_BOOTSTRAP_HXX_
+#ifndef INCLUDED_CPPUHELPER_BOOTSTRAP_HXX
+#define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX
 
 #include "sal/config.h"
 #include "com/sun/star/uno/Exception.hpp"
diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx
index dc0b8dd4f905..11e187a3f560 100644
--- a/include/cppuhelper/compbase.hxx
+++ b/include/cppuhelper/compbase.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 _CPPUHELPER_COMPBASE_HXX_
-#define _CPPUHELPER_COMPBASE_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE_HXX
 
 #include <cppuhelper/compbase_ex.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx
index 8948f0120f36..636547bc0557 100644
--- a/include/cppuhelper/compbase1.hxx
+++ b/include/cppuhelper/compbase1.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 _CPPUHELPER_COMPBASE1_HXX_
-#define _CPPUHELPER_COMPBASE1_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE1_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE1_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx
index 588a47a6fa8a..408c23d301b8 100644
--- a/include/cppuhelper/compbase10.hxx
+++ b/include/cppuhelper/compbase10.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 _CPPUHELPER_COMPBASE10_HXX_
-#define _CPPUHELPER_COMPBASE10_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE10_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE10_HXX
 
 #include <cppuhelper/implbase10.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx
index 259a12258f8d..84685bc6cb6e 100644
--- a/include/cppuhelper/compbase11.hxx
+++ b/include/cppuhelper/compbase11.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 _CPPUHELPER_COMPBASE11_HXX_
-#define _CPPUHELPER_COMPBASE11_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE11_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE11_HXX
 
 #include <cppuhelper/implbase11.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx
index 3009dac8f46e..07adea43884a 100644
--- a/include/cppuhelper/compbase12.hxx
+++ b/include/cppuhelper/compbase12.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 _CPPUHELPER_COMPBASE12_HXX_
-#define _CPPUHELPER_COMPBASE12_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE12_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE12_HXX
 
 #include <cppuhelper/implbase12.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx
index e54a38b00e3b..f848b337f012 100644
--- a/include/cppuhelper/compbase2.hxx
+++ b/include/cppuhelper/compbase2.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 _CPPUHELPER_COMPBASE2_HXX_
-#define _CPPUHELPER_COMPBASE2_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE2_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE2_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx
index e43991a7c117..c51b46c56471 100644
--- a/include/cppuhelper/compbase3.hxx
+++ b/include/cppuhelper/compbase3.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 _CPPUHELPER_COMPBASE3_HXX_
-#define _CPPUHELPER_COMPBASE3_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE3_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE3_HXX
 
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx
index a20542e57abe..60c50594ac61 100644
--- a/include/cppuhelper/compbase4.hxx
+++ b/include/cppuhelper/compbase4.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 _CPPUHELPER_COMPBASE4_HXX_
-#define _CPPUHELPER_COMPBASE4_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE4_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE4_HXX
 
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx
index b22b1038b573..82aa7c13ac32 100644
--- a/include/cppuhelper/compbase5.hxx
+++ b/include/cppuhelper/compbase5.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 _CPPUHELPER_COMPBASE5_HXX_
-#define _CPPUHELPER_COMPBASE5_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE5_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE5_HXX
 
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx
index 778bbb722295..77168e1b3aa1 100644
--- a/include/cppuhelper/compbase6.hxx
+++ b/include/cppuhelper/compbase6.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 _CPPUHELPER_COMPBASE6_HXX_
-#define _CPPUHELPER_COMPBASE6_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE6_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE6_HXX
 
 #include <cppuhelper/implbase6.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx
index edf3af3fd258..a069cfe7ed3c 100644
--- a/include/cppuhelper/compbase7.hxx
+++ b/include/cppuhelper/compbase7.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 _CPPUHELPER_COMPBASE7_HXX_
-#define _CPPUHELPER_COMPBASE7_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE7_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE7_HXX
 
 #include <cppuhelper/implbase7.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx
index efff5c4a2d09..989b8d43f637 100644
--- a/include/cppuhelper/compbase8.hxx
+++ b/include/cppuhelper/compbase8.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 _CPPUHELPER_COMPBASE8_HXX_
-#define _CPPUHELPER_COMPBASE8_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE8_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE8_HXX
 
 #include <cppuhelper/implbase8.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx
index 5496e63864bd..0fac12ce4075 100644
--- a/include/cppuhelper/compbase9.hxx
+++ b/include/cppuhelper/compbase9.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 _CPPUHELPER_COMPBASE9_HXX_
-#define _CPPUHELPER_COMPBASE9_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE9_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE9_HXX
 
 #include <cppuhelper/implbase9.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx
index 5937f60e29cc..8cfa78a089a0 100644
--- a/include/cppuhelper/compbase_ex.hxx
+++ b/include/cppuhelper/compbase_ex.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 _CPPUHELPER_COMPBASE_EX_HXX_
-#define _CPPUHELPER_COMPBASE_EX_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE_EX_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE_EX_HXX
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase_ex.hxx>
diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx
index 64460959fbbf..7fb919d2b0a6 100644
--- a/include/cppuhelper/component.hxx
+++ b/include/cppuhelper/component.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 _CPPUHELPER_COMPONENT_HXX_
-#define _CPPUHELPER_COMPONENT_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPONENT_HXX
+#define INCLUDED_CPPUHELPER_COMPONENT_HXX
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/weakagg.hxx>
diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx
index 575fa490a452..943efdd7fcdd 100644
--- a/include/cppuhelper/component_context.hxx
+++ b/include/cppuhelper/component_context.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 _CPPUHELPER_COMPONENT_CONTEXT_HXX_
-#define _CPPUHELPER_COMPONENT_CONTEXT_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX
+#define INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
diff --git a/include/cppuhelper/cppuhelperdllapi.h b/include/cppuhelper/cppuhelperdllapi.h
index 8489402c4e86..1eff7bedc313 100644
--- a/include/cppuhelper/cppuhelperdllapi.h
+++ b/include/cppuhelper/cppuhelperdllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CPPUHELPERDLLAPI_H
-#define INCLUDED_CPPUHELPERDLLAPI_H
+#ifndef INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H
+#define INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H
 
 #include "sal/types.h"
 
@@ -29,6 +29,6 @@
 #endif
 #define CPPUHELPER_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_CPPUHELPERDLLAPI_H */
+#endif // INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/exc_hlp.hxx b/include/cppuhelper/exc_hlp.hxx
index 9c110ee6c018..0ca1d1f8e086 100644
--- a/include/cppuhelper/exc_hlp.hxx
+++ b/include/cppuhelper/exc_hlp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPUHELPER_EXC_HLP_HXX_
-#define _CPPUHELPER_EXC_HLP_HXX_
+#ifndef INCLUDED_CPPUHELPER_EXC_HLP_HXX
+#define INCLUDED_CPPUHELPER_EXC_HLP_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 #include "cppuhelperdllapi.h"
diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx
index 8dfda840d51c..5a20cc7fcba8 100644
--- a/include/cppuhelper/factory.hxx
+++ b/include/cppuhelper/factory.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 _CPPUHELPER_FACTORY_HXX_
-#define _CPPUHELPER_FACTORY_HXX_
+#ifndef INCLUDED_CPPUHELPER_FACTORY_HXX
+#define INCLUDED_CPPUHELPER_FACTORY_HXX
 
 #include <rtl/ustring.hxx>
 #include <uno/dispatcher.h>
diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx
index 06ac7a8c8d1a..5c1bdf45a159 100644
--- a/include/cppuhelper/implbase.hxx
+++ b/include/cppuhelper/implbase.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 _CPPUHELPER_IMPLBASE_HXX_
-#define _CPPUHELPER_IMPLBASE_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE_HXX
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index ead86fe6c56a..b0c1b0bd0893 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.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 _CPPUHELPER_IMPLBASE1_HXX_
-#define _CPPUHELPER_IMPLBASE1_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE1_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE1_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx
index 57fdda5b3ce0..56434e932ba3 100644
--- a/include/cppuhelper/implbase10.hxx
+++ b/include/cppuhelper/implbase10.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 _CPPUHELPER_IMPLBASE10_HXX_
-#define _CPPUHELPER_IMPLBASE10_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE10_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE10_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx
index bd282e70fdc2..c7ff78a7cd85 100644
--- a/include/cppuhelper/implbase11.hxx
+++ b/include/cppuhelper/implbase11.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 _CPPUHELPER_IMPLBASE11_HXX_
-#define _CPPUHELPER_IMPLBASE11_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE11_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE11_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx
index a1d4bf17fa07..08d83069f300 100644
--- a/include/cppuhelper/implbase12.hxx
+++ b/include/cppuhelper/implbase12.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 _CPPUHELPER_IMPLBASE12_HXX_
-#define _CPPUHELPER_IMPLBASE12_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE12_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE12_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx
index b50fb038564c..f8bd60456054 100644
--- a/include/cppuhelper/implbase13.hxx
+++ b/include/cppuhelper/implbase13.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 _CPPUHELPER_IMPLBASE13_HXX_
-#define _CPPUHELPER_IMPLBASE13_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE13_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE13_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx
index acd9bbe5e211..1a80cacd436e 100644
--- a/include/cppuhelper/implbase2.hxx
+++ b/include/cppuhelper/implbase2.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 _CPPUHELPER_IMPLBASE2_HXX_
-#define _CPPUHELPER_IMPLBASE2_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE2_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE2_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx
index f887ee470538..0a4ac365d754 100644
--- a/include/cppuhelper/implbase3.hxx
+++ b/include/cppuhelper/implbase3.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 _CPPUHELPER_IMPLBASE3_HXX_
-#define _CPPUHELPER_IMPLBASE3_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE3_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE3_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx
index 54fd60e0f54f..29c208d189fa 100644
--- a/include/cppuhelper/implbase4.hxx
+++ b/include/cppuhelper/implbase4.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 _CPPUHELPER_IMPLBASE4_HXX_
-#define _CPPUHELPER_IMPLBASE4_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE4_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE4_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx
index 4a4b3e640426..f2be88d7f611 100644
--- a/include/cppuhelper/implbase5.hxx
+++ b/include/cppuhelper/implbase5.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 _CPPUHELPER_IMPLBASE5_HXX_
-#define _CPPUHELPER_IMPLBASE5_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE5_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE5_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx
index 090da8d8a862..6bff24ab030f 100644
--- a/include/cppuhelper/implbase6.hxx
+++ b/include/cppuhelper/implbase6.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 _CPPUHELPER_IMPLBASE6_HXX_
-#define _CPPUHELPER_IMPLBASE6_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE6_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE6_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx
index 62998349b822..8cf78464ce41 100644
--- a/include/cppuhelper/implbase7.hxx
+++ b/include/cppuhelper/implbase7.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 _CPPUHELPER_IMPLBASE7_HXX_
-#define _CPPUHELPER_IMPLBASE7_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE7_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE7_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx
index 117dba731b9c..d7c417bd62ef 100644
--- a/include/cppuhelper/implbase8.hxx
+++ b/include/cppuhelper/implbase8.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 _CPPUHELPER_IMPLBASE8_HXX_
-#define _CPPUHELPER_IMPLBASE8_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE8_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE8_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx
index ca4cdba53f3d..f28cfeae421f 100644
--- a/include/cppuhelper/implbase9.hxx
+++ b/include/cppuhelper/implbase9.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 _CPPUHELPER_IMPLBASE9_HXX_
-#define _CPPUHELPER_IMPLBASE9_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE9_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE9_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx
index 4eb111de898a..36d379cb6de1 100644
--- a/include/cppuhelper/implbase_ex.hxx
+++ b/include/cppuhelper/implbase_ex.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 _CPPUHELPER_IMPLBASE_EX_HXX_
-#define _CPPUHELPER_IMPLBASE_EX_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
diff --git a/include/cppuhelper/implbase_ex_post.hxx b/include/cppuhelper/implbase_ex_post.hxx
index 6d97b760613b..8b5ca048e81e 100644
--- a/include/cppuhelper/implbase_ex_post.hxx
+++ b/include/cppuhelper/implbase_ex_post.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 _CPPUHELPER_IMPLBASE_EX_POST_HXX_
-#define _CPPUHELPER_IMPLBASE_EX_POST_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE_EX_POST_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE_EX_POST_HXX
 
 /// @cond INTERNAL
 
diff --git a/include/cppuhelper/implbase_ex_pre.hxx b/include/cppuhelper/implbase_ex_pre.hxx
index a9eb82df0251..8590f9d2cd90 100644
--- a/include/cppuhelper/implbase_ex_pre.hxx
+++ b/include/cppuhelper/implbase_ex_pre.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 _CPPUHELPER_IMPLBASE_EX_PRE_HXX_
-#define _CPPUHELPER_IMPLBASE_EX_PRE_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE_EX_PRE_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE_EX_PRE_HXX
 
 /// @cond INTERNAL
 
diff --git a/include/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx
index 298c0dc9e9ba..c99a9b9156c9 100644
--- a/include/cppuhelper/implementationentry.hxx
+++ b/include/cppuhelper/implementationentry.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 _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-#define _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX
+#define INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX
 
 #include <cppuhelper/factory.hxx>
 #include "cppuhelperdllapi.h"
diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h
index 9a1cb4d76376..39e467e0e2dc 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -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 _CPPUHELPER_INTERFACECONTAINER_H_
-#define _CPPUHELPER_INTERFACECONTAINER_H_
+#ifndef INCLUDED_CPPUHELPER_INTERFACECONTAINER_H
+#define INCLUDED_CPPUHELPER_INTERFACECONTAINER_H
 
 #include <vector>
 #include <osl/mutex.hxx>
diff --git a/include/cppuhelper/interfacecontainer.hxx b/include/cppuhelper/interfacecontainer.hxx
index 292278f7a078..70c457d2b0ce 100644
--- a/include/cppuhelper/interfacecontainer.hxx
+++ b/include/cppuhelper/interfacecontainer.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 _CPPUHELPER_INTERFACECONTAINER_HXX_
-#define _CPPUHELPER_INTERFACECONTAINER_HXX_
+#ifndef INCLUDED_CPPUHELPER_INTERFACECONTAINER_HXX
+#define INCLUDED_CPPUHELPER_INTERFACECONTAINER_HXX
 
 #include <cppuhelper/interfacecontainer.h>
 
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index aa99ebaa6536..4f886d13df5f 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPUHELPER_PROPSHLP_HXX
-#define _CPPUHELPER_PROPSHLP_HXX
+#ifndef INCLUDED_CPPUHELPER_PROPSHLP_HXX
+#define INCLUDED_CPPUHELPER_PROPSHLP_HXX
 
 #include <rtl/alloc.h>
 
diff --git a/include/cppuhelper/proptypehlp.h b/include/cppuhelper/proptypehlp.h
index 3236ca0363c3..343a9f82bb5d 100644
--- a/include/cppuhelper/proptypehlp.h
+++ b/include/cppuhelper/proptypehlp.h
@@ -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 _CPPUHELPER_PROPTYPEHLP_H
-#define _CPPUHELPER_PROPTYPEHLP_H
+#ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_H
+#define INCLUDED_CPPUHELPER_PROPTYPEHLP_H
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/TypeClass.hpp>
diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx
index 08107f3b91f7..a848964537e2 100644
--- a/include/cppuhelper/proptypehlp.hxx
+++ b/include/cppuhelper/proptypehlp.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 _CPPUHELPER_PROPTYPEHLP_HXX
-#define _CPPUHELPER_PROPTYPEHLP_HXX
+#ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX
+#define INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX
 
 #include <cppuhelper/proptypehlp.h>
 
diff --git a/include/cppuhelper/queryinterface.hxx b/include/cppuhelper/queryinterface.hxx
index e8f2dfa9dcbf..b01dfa6dd453 100644
--- a/include/cppuhelper/queryinterface.hxx
+++ b/include/cppuhelper/queryinterface.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPUHELPER_QUERYINTERFACE_HXX_
-#define _CPPUHELPER_QUERYINTERFACE_HXX_
+#ifndef INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX
+#define INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX
 
 #include "sal/config.h"
 #include "com/sun/star/uno/Any.hxx"
diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx
index bb6d4ede7dc8..c0abe4779128 100644
--- a/include/cppuhelper/shlib.hxx
+++ b/include/cppuhelper/shlib.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 _CPPUHELPER_SHLIB_HXX_
-#define _CPPUHELPER_SHLIB_HXX_
+#ifndef INCLUDED_CPPUHELPER_SHLIB_HXX
+#define INCLUDED_CPPUHELPER_SHLIB_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx
index 24201c9a8982..79241e52cb31 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.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 _CPPUHELPER_TYPEPROVIDER_HXX_
-#define _CPPUHELPER_TYPEPROVIDER_HXX_
+#ifndef INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX
+#define INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX
 
 #include <rtl/alloc.h>
 #include <rtl/uuid.h>
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index 80d5ec07c500..1bc1646e85c7 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.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 _CPPUHELPER_WEAK_HXX_
-#define _CPPUHELPER_WEAK_HXX_
+#ifndef INCLUDED_CPPUHELPER_WEAK_HXX
+#define INCLUDED_CPPUHELPER_WEAK_HXX
 
 #include <osl/interlck.h>
 #include <rtl/alloc.h>
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index bfe4ba5151d3..397a80e46ac3 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.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 _CPPUHELPER_WEAKAGG_HXX_
-#define _CPPUHELPER_WEAKAGG_HXX_
+#ifndef INCLUDED_CPPUHELPER_WEAKAGG_HXX
+#define INCLUDED_CPPUHELPER_WEAKAGG_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/uno/XAggregation.hpp>
diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx
index 0a9530608159..218612acada3 100644
--- a/include/cppuhelper/weakref.hxx
+++ b/include/cppuhelper/weakref.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 _CPPUHELPER_WEAKREF_HXX_
-#define _CPPUHELPER_WEAKREF_HXX_
+#ifndef INCLUDED_CPPUHELPER_WEAKREF_HXX
+#define INCLUDED_CPPUHELPER_WEAKREF_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include "cppuhelperdllapi.h"
author	Thomas Arnhold <thomas@arnhold.org>	2013-10-23 19:17:00 +0200
committer	Thomas Arnhold <thomas@arnhold.org>	2013-10-23 23:22:30 +0200
commit	0bd7f12d41567842b1e31514e1d84340d90f5b42 (patch)
tree	d1140425ddbb62c4cf71634f2813f7e5dd7d88cb /include
parent	f20eef009438883ebc205c9cce3e4bac87256f29 (diff)