fixincludeguards.sh: canvas

Change-Id: I5b17411c58e5c5ae7b473d263fa5e4ee97ff35c8

83 files changed, 214 insertions, 214 deletions

diff --git a/canvas/source/cairo/cairo_cachedbitmap.hxx b/canvas/source/cairo/cairo_cachedbitmap.hxx
index 6fa1fbf2a9ed..997f70c73168 100644
--- a/canvas/source/cairo/cairo_cachedbitmap.hxx
+++ b/canvas/source/cairo/cairo_cachedbitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CACHEDBITMAP_HXX
-#define _CAIROCANVAS_CACHEDBITMAP_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
 
 #include <canvas/base/cachedprimitivebase.hxx>
 
@@ -56,6 +56,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_CACHEDBITMAP_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_cairo.hxx b/canvas/source/cairo/cairo_cairo.hxx
index 80d508596a53..41df12b8ced1 100644
--- a/canvas/source/cairo/cairo_cairo.hxx
+++ b/canvas/source/cairo/cairo_cairo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CAIRO_HXX
-#define _CAIROCANVAS_CAIRO_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CAIRO_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CAIRO_HXX
 
 #include <sal/config.h>
 #include <boost/shared_ptr.hpp>
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index 12bf426142fc..449db29d233c 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CANVAS_HXX_
-#define _CAIROCANVAS_CANVAS_HXX_
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CANVAS_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVAS_HXX
 
 #include <rtl/ref.hxx>
 
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx
index b1d669ed5713..7f725bfe89b0 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CANVASBITMAP_HXX
-#define _CAIROCANVAS_CANVASBITMAP_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase4.hxx>
 
@@ -127,6 +127,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_CANVASBITMAP_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx
index cfb6377f6a69..da5a9db84313 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CANVASCUSTOMSPRITE_HXX
-#define _CAIROCANVAS_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase4.hxx>
 #include <comphelper/uno3.hxx>
@@ -145,6 +145,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_CANVASCUSTOMSPRITE_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 3e5c1fff8c39..f36fe100f1e6 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CANVASFONT_HXX
-#define _CAIROCANVAS_CANVASFONT_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
@@ -85,6 +85,6 @@ namespace cairocanvas
 
 }
 
-#endif /* _CAIROCANVAS_CANVASFONT_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index 8b83d2c292fa..10085bac9a2f 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CANVASHELPER_HXX_
-#define _CAIROCANVAS_CANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -321,6 +321,6 @@ namespace cairocanvas
                                       ::com::sun::star::rendering::FillRule eFillrule );
 }
 
-#endif /* _CAIROCANVAS_CANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx
index fec36e59d1c6..08de5c636dd6 100644
--- a/canvas/source/cairo/cairo_devicehelper.hxx
+++ b/canvas/source/cairo/cairo_devicehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_DEVICEHELPER_HXX
-#define _CAIROCANVAS_DEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
diff --git a/canvas/source/cairo/cairo_quartz_cairo.hxx b/canvas/source/cairo/cairo_quartz_cairo.hxx
index 62621fd7a4a0..9fcd67bcfc50 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.hxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_QUARTZ_CAIRO_HXX
-#define _CAIROCANVAS_QUARTZ_CAIRO_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_QUARTZ_CAIRO_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_QUARTZ_CAIRO_HXX
 
 #include "cairo_cairo.hxx"
 
diff --git a/canvas/source/cairo/cairo_repainttarget.hxx b/canvas/source/cairo/cairo_repainttarget.hxx
index 16a1d1dc3659..ab7f32976a66 100644
--- a/canvas/source/cairo/cairo_repainttarget.hxx
+++ b/canvas/source/cairo/cairo_repainttarget.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_REPAINTTARGET_HXX
-#define _CAIROCANVAS_REPAINTTARGET_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
 
 #include <rtl/ref.hxx>
 
@@ -47,6 +47,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_REPAINTTARGET_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_sprite.hxx b/canvas/source/cairo/cairo_sprite.hxx
index 47572d2b6f47..c63d42dc887a 100644
--- a/canvas/source/cairo/cairo_sprite.hxx
+++ b/canvas/source/cairo/cairo_sprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SPRITE_HXX
-#define _CAIROCANVAS_SPRITE_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SPRITE_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -63,6 +63,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_SPRITE_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_SPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index 1c2a6aa43d06..0b622db0310c 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SPRITECANVAS_HXX_
-#define _CAIROCANVAS_SPRITECANVAS_HXX_
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVAS_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVAS_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx
index 07c3aa8a564d..39ff6741faaa 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.hxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SPRITECANVASHELPER_HXX_
-#define _CAIROCANVAS_SPRITECANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
@@ -141,6 +141,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_SPRITECANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index 01672e79e6dc..b8d82db29a8b 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SPRITEDEVICEHELPER_HXX
-#define _CAIROCANVAS_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
diff --git a/canvas/source/cairo/cairo_spritehelper.hxx b/canvas/source/cairo/cairo_spritehelper.hxx
index 69385e5ebbe0..8a05608029d5 100644
--- a/canvas/source/cairo/cairo_spritehelper.hxx
+++ b/canvas/source/cairo/cairo_spritehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SPRITEHELPER_HXX
-#define _CAIROCANVAS_SPRITEHELPER_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 
@@ -104,6 +104,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_SPRITEHELPER_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_surfaceprovider.hxx b/canvas/source/cairo/cairo_surfaceprovider.hxx
index b4391fdad265..d7b07a7ba9db 100644
--- a/canvas/source/cairo/cairo_surfaceprovider.hxx
+++ b/canvas/source/cairo/cairo_surfaceprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SURFACEPROVIDER_HXX
-#define _CAIROCANVAS_SURFACEPROVIDER_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SURFACEPROVIDER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SURFACEPROVIDER_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index 406b6738efc8..0dcd32d0ab09 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_TEXTLAYOUT_HXX
-#define _CAIROCANVAS_TEXTLAYOUT_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -107,6 +107,6 @@ namespace cairocanvas
 
 }
 
-#endif /* _CAIROCANVAS_TEXTLAYOUT_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_win32_cairo.hxx b/canvas/source/cairo/cairo_win32_cairo.hxx
index 6bb16deb7009..59b7448cecad 100644
--- a/canvas/source/cairo/cairo_win32_cairo.hxx
+++ b/canvas/source/cairo/cairo_win32_cairo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_WIN32_CAIRO_HXX
-#define _CAIROCANVAS_WIN32_CAIRO_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_WIN32_CAIRO_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_WIN32_CAIRO_HXX
 
 #include "cairo_cairo.hxx"
 #include <prewin.h>
diff --git a/canvas/source/cairo/cairo_xlib_cairo.hxx b/canvas/source/cairo/cairo_xlib_cairo.hxx
index 105c570eae7d..fa86ceaa5716 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.hxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_XLIB_CAIRO_HXX
-#define _CAIROCANVAS_XLIB_CAIRO_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_XLIB_CAIRO_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_XLIB_CAIRO_HXX
 
 #include "cairo_cairo.hxx"
 
diff --git a/canvas/source/directx/dx_bitmap.hxx b/canvas/source/directx/dx_bitmap.hxx
index fcb0a09fca37..2f57663db245 100644
--- a/canvas/source/directx/dx_bitmap.hxx
+++ b/canvas/source/directx/dx_bitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_DXBITMAP_HXX
-#define _DXCANVAS_DXBITMAP_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_BITMAP_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_BITMAP_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.hxx b/canvas/source/directx/dx_bitmapcanvashelper.hxx
index 670544a0c6ab..cbfd7eef605d 100644
--- a/canvas/source/directx/dx_bitmapcanvashelper.hxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_BITMAPCANVASHELPER_HXX_
-#define _DXCANVAS_BITMAPCANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -126,6 +126,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_BITMAPCANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_bitmapprovider.hxx b/canvas/source/directx/dx_bitmapprovider.hxx
index ec92c77c79c2..bf83fd19bb53 100644
--- a/canvas/source/directx/dx_bitmapprovider.hxx
+++ b/canvas/source/directx/dx_bitmapprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_BITMAPPROVIDER_HXX_
-#define _DXCANVAS_BITMAPPROVIDER_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX
 
 #include "dx_ibitmap.hxx"
 #include <boost/shared_ptr.hpp>
diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx
index ef0c722efe95..d6574ac70fd7 100644
--- a/canvas/source/directx/dx_canvas.hxx
+++ b/canvas/source/directx/dx_canvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_CANVAS_HXX_
-#define _DXCANVAS_CANVAS_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CANVAS_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CANVAS_HXX
 
 #include <rtl/ref.hxx>
 
diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx
index 0db10b88f9be..2396468d6ed5 100644
--- a/canvas/source/directx/dx_canvasbitmap.hxx
+++ b/canvas/source/directx/dx_canvasbitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_CANVASBITMAP_HXX
-#define _DXCANVAS_CANVASBITMAP_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase4.hxx>
 
@@ -93,6 +93,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_CANVASBITMAP_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
index 1b0d57a5362b..f297056cefa0 100644
--- a/canvas/source/directx/dx_canvascustomsprite.hxx
+++ b/canvas/source/directx/dx_canvascustomsprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_CANVASCUSTOMSPRITE_HXX
-#define _DXCANVAS_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase4.hxx>
 #include <comphelper/uno3.hxx>
@@ -128,6 +128,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_CANVASCUSTOMSPRITE_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index c1a0f3371a4a..bfeb7d362715 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_CANVASFONT_HXX
-#define _DXCANVAS_CANVASFONT_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CANVASFONT_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
@@ -91,6 +91,6 @@ namespace dxcanvas
 
 }
 
-#endif /* _DXCANVAS_CANVASFONT_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_canvashelper.hxx b/canvas/source/directx/dx_canvashelper.hxx
index 5a6527d2fd29..b1eb5cfb8206 100644
--- a/canvas/source/directx/dx_canvashelper.hxx
+++ b/canvas/source/directx/dx_canvashelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_CANVASHELPER_HXX_
-#define _DXCANVAS_CANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CANVASHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -248,6 +248,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_CANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx
index 73b09f1191f6..40fe22fbe908 100644
--- a/canvas/source/directx/dx_config.hxx
+++ b/canvas/source/directx/dx_config.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_DXCONFIG_HXX
-#define _DXCANVAS_DXCONFIG_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CONFIG_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CONFIG_HXX
 
 #include <unotools/configitem.hxx>
 #include <boost/optional.hpp>
@@ -78,6 +78,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* #ifndef _DXCANVAS_DXCONFIG_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_CONFIG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx
index abc9eae570ca..6bd32f040dfe 100644
--- a/canvas/source/directx/dx_devicehelper.hxx
+++ b/canvas/source/directx/dx_devicehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_DEVICEHELPER_HXX
-#define _DXCANVAS_DEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
@@ -110,6 +110,6 @@ namespace dxcanvas
     typedef ::rtl::Reference< com::sun::star::rendering::XGraphicDevice > DeviceRef;
 }
 
-#endif /* _DXCANVAS_DEVICEHELPER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_gdiplususer.hxx b/canvas/source/directx/dx_gdiplususer.hxx
index 2de853a8298e..c78877f77dad 100644
--- a/canvas/source/directx/dx_gdiplususer.hxx
+++ b/canvas/source/directx/dx_gdiplususer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_GDIPLUSUSER_HXX
-#define _DXCANVAS_GDIPLUSUSER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
 
 #include <sal/config.h>
 
@@ -44,6 +44,6 @@ namespace dxcanvas
 
 }
 
-#endif /* _DXCANVAS_GDIPLUSUSER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_graphicsprovider.hxx b/canvas/source/directx/dx_graphicsprovider.hxx
index ffd3f0e5b685..3e2ba845de36 100644
--- a/canvas/source/directx/dx_graphicsprovider.hxx
+++ b/canvas/source/directx/dx_graphicsprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_GRAPHICSPROVIDER_HXX
-#define _DXCANVAS_GRAPHICSPROVIDER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
 
 #include "dx_winstuff.hxx"
 
@@ -42,6 +42,6 @@ namespace dxcanvas
     typedef ::boost::shared_ptr< GraphicsProvider > GraphicsProviderSharedPtr;
 }
 
-#endif /* _DXCANVAS_GRAPHICSPROVIDER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_ibitmap.hxx b/canvas/source/directx/dx_ibitmap.hxx
index 8c25cc8ae769..d37087a37a60 100644
--- a/canvas/source/directx/dx_ibitmap.hxx
+++ b/canvas/source/directx/dx_ibitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_DXIBITMAP_HXX
-#define _DXCANVAS_DXIBITMAP_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_IBITMAP_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_IBITMAP_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx
index 0720046a876b..99cf7efd9388 100644
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_IMPLTOOLS_HXX
-#define _DXCANVAS_IMPLTOOLS_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -128,6 +128,6 @@ namespace dxcanvas
     }
 }
 
-#endif /* _DXCANVAS_IMPLTOOLS_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_linepolypolygon.hxx b/canvas/source/directx/dx_linepolypolygon.hxx
index cb6d7a298378..1b44110b28d5 100644
--- a/canvas/source/directx/dx_linepolypolygon.hxx
+++ b/canvas/source/directx/dx_linepolypolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_LINEPOLYPOLYGON_HXX_
-#define _DXCANVAS_LINEPOLYPOLYGON_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
 
 #include <canvas/canvastools.hxx>
 #include <basegfx/tools/unopolypolygon.hxx>
@@ -45,6 +45,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_LINEPOLYPOLYGON_HXX_ */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx
index 34babfe52cbe..7f3f46edf098 100644
--- a/canvas/source/directx/dx_rendermodule.hxx
+++ b/canvas/source/directx/dx_rendermodule.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_RENDERMODULE_HXX
-#define _DXCANVAS_RENDERMODULE_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_RENDERMODULE_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_RENDERMODULE_HXX
 
 #include <basegfx/vector/b2ivector.hxx>
 #include <basegfx/range/b2irectangle.hxx>
diff --git a/canvas/source/directx/dx_sprite.hxx b/canvas/source/directx/dx_sprite.hxx
index 3f8d6586b544..7ac2cd650898 100644
--- a/canvas/source/directx/dx_sprite.hxx
+++ b/canvas/source/directx/dx_sprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DXCANVAS_SPRITE_HXX
-#define INCLUDED_DXCANVAS_SPRITE_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SPRITE_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SPRITE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -40,6 +40,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* INCLUDED_DXCANVAS_SPRITE_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_SPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx
index 97ff8b749acb..1859f88e9a3a 100644
--- a/canvas/source/directx/dx_spritecanvas.hxx
+++ b/canvas/source/directx/dx_spritecanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_SPRITECANVAS_HXX_
-#define _DXCANVAS_SPRITECANVAS_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVAS_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVAS_HXX
 
 #include <rtl/ref.hxx>
 
diff --git a/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx
index fe46427b3d8d..bb2eb5273cd0 100644
--- a/canvas/source/directx/dx_spritecanvashelper.hxx
+++ b/canvas/source/directx/dx_spritecanvashelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_SPRITECANVASHELPER_HXX_
-#define _DXCANVAS_SPRITECANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
@@ -150,6 +150,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_SPRITECANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index a6a5ff2d33c2..41a2f4afa9c3 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_SPRITEDEVICEHELPER_HXX
-#define _DXCANVAS_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
@@ -102,6 +102,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_SPRITEDEVICEHELPER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_spritehelper.hxx b/canvas/source/directx/dx_spritehelper.hxx
index c92a9fbb1661..bf9a8216aaba 100644
--- a/canvas/source/directx/dx_spritehelper.hxx
+++ b/canvas/source/directx/dx_spritehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_SPRITEHELPER_HXX
-#define _DXCANVAS_SPRITEHELPER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 
@@ -100,6 +100,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_SPRITEHELPER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx
index 5d054ff420d9..7df4a651a9d1 100644
--- a/canvas/source/directx/dx_surfacebitmap.hxx
+++ b/canvas/source/directx/dx_surfacebitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_DXSURFACEBITMAP_HXX
-#define _DXCANVAS_DXSURFACEBITMAP_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX
 
 #include <canvas/rendering/isurfaceproxy.hxx>
 #include <canvas/rendering/isurfaceproxymanager.hxx>
diff --git a/canvas/source/directx/dx_surfacegraphics.hxx b/canvas/source/directx/dx_surfacegraphics.hxx
index b3b3b6609797..f06de843605c 100644
--- a/canvas/source/directx/dx_surfacegraphics.hxx
+++ b/canvas/source/directx/dx_surfacegraphics.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_SURFACEGRAPHICS_HXX
-#define _DXCANVAS_SURFACEGRAPHICS_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
 
 #include "dx_graphicsprovider.hxx"
 
@@ -34,6 +34,6 @@ namespace dxcanvas
     GraphicsSharedPtr createSurfaceGraphics(const COMReference<surface_type>& rSurface );
 }
 
-#endif /* _DXCANVAS_SURFACEGRAPHICS_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx
index 795280c2aade..c750e503e0d0 100644
--- a/canvas/source/directx/dx_textlayout.hxx
+++ b/canvas/source/directx/dx_textlayout.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_TEXTLAYOUT_HXX
-#define _DXCANVAS_TEXTLAYOUT_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -102,6 +102,6 @@ namespace dxcanvas
 
 }
 
-#endif /* _DXCANVAS_TEXTLAYOUT_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx
index 7de489ca9f2b..369e4065b743 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.hxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TEXTLAYOUT_DRAWHELPER_HXX
-#define _TEXTLAYOUT_DRAWHELPER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
 
 #include <boost/shared_ptr.hpp>
 
@@ -74,6 +74,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _TEXTLAYOUT_DRAWHELPER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx
index ab7d73e351be..6187ed4adf05 100644
--- a/canvas/source/directx/dx_vcltools.hxx
+++ b/canvas/source/directx/dx_vcltools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_VCLTOOLS_HXX
-#define _DXCANVAS_VCLTOOLS_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/util/TriState.hpp>
@@ -48,6 +48,6 @@ namespace dxcanvas
     }
 }
 
-#endif /* _DXCANVAS_VCLTOOLS_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 21e3e05fd089..368045a57281 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_WINSTUFF_HXX
-#define _DXCANVAS_WINSTUFF_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_WINSTUFF_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_WINSTUFF_HXX
 
 #include <algorithm>
 
@@ -214,6 +214,6 @@ namespace dxcanvas
 #undef DELETE
 #undef PolyPolygon
 
-#endif /* _DXCANVAS_WINSTUFF_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_WINSTUFF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
index 50781c3bb491..328fb5723068 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_BITMAPCANVASHELPER_HXX_
-#define OGL_BITMAPCANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx
index b9964126f025..587fff9b4bfd 100644
--- a/canvas/source/opengl/ogl_buffercontext.hxx
+++ b/canvas/source/opengl/ogl_buffercontext.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_BUFFERCONTEXT_HXX_
-#define OGL_BUFFERCONTEXT_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
 
 #include <sal/config.h>
 #include <boost/shared_ptr.hpp>
diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx
index b874bde8da42..d7f840a8c942 100644
--- a/canvas/source/opengl/ogl_canvasbitmap.hxx
+++ b/canvas/source/opengl/ogl_canvasbitmap.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASBITMAP_HXX
-#define OGL_CANVASBITMAP_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase2.hxx>
 
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx
index a96ce6494d08..c25ee865b2e8 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.hxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASCUSTOMSPRITE_HXX
-#define OGL_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index 9a262975cf11..041e87bac4b6 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASFONT_HXX
-#define OGL_CANVASFONT_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASFONT_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx
index b7280ac1c9a1..98ee6733ed4b 100644
--- a/canvas/source/opengl/ogl_canvashelper.hxx
+++ b/canvas/source/opengl/ogl_canvashelper.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASHELPER_HXX_
-#define OGL_CANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASHELPER_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 
diff --git a/canvas/source/opengl/ogl_canvastools.hxx b/canvas/source/opengl/ogl_canvastools.hxx
index 458bddd1d1e6..43a14bde4be8 100644
--- a/canvas/source/opengl/ogl_canvastools.hxx
+++ b/canvas/source/opengl/ogl_canvastools.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASTOOLS_HXX
-#define OGL_CANVASTOOLS_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX
 
 #include <sal/config.h>
 #include <vector>
diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx
index 6efc6dbe8fb1..52be9f955915 100644
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_SPRITECANVAS_HXX_
-#define OGL_SPRITECANVAS_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX
 
 #include <rtl/ref.hxx>
 
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index c87bdf84d18f..9db73df8795a 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_SPRITEDEVICEHELPER_HXX
-#define OGL_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX
 
 #include <rtl/ref.hxx>
 #include <canvas/elapsedtime.hxx>
diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx
index 64c50f7f2bb8..590be59b5967 100644
--- a/canvas/source/opengl/ogl_textlayout.hxx
+++ b/canvas/source/opengl/ogl_textlayout.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_TEXTLAYOUT_HXX
-#define OGL_TEXTLAYOUT_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
diff --git a/canvas/source/opengl/ogl_texturecache.hxx b/canvas/source/opengl/ogl_texturecache.hxx
index 50d025a21b89..e80b57482def 100644
--- a/canvas/source/opengl/ogl_texturecache.hxx
+++ b/canvas/source/opengl/ogl_texturecache.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_TEXTURECACHE_HXX
-#define OGL_TEXTURECACHE_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX
 
 #include <sal/types.h>
 #include <boost/unordered_map.hpp>
diff --git a/canvas/source/opengl/ogl_tools.hxx b/canvas/source/opengl/ogl_tools.hxx
index d61ab45dd447..c9a22813522c 100644
--- a/canvas/source/opengl/ogl_tools.hxx
+++ b/canvas/source/opengl/ogl_tools.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVAS_TOOLS_HXX
-#define OGL_CANVAS_TOOLS_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_TOOLS_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_TOOLS_HXX
 
 #include <sal/config.h>
 #include <GL/gl.h>
diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx
index 92e65132a9fe..094912c3f0b7 100644
--- a/canvas/source/tools/page.hxx
+++ b/canvas/source/tools/page.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_PAGE_HXX
-#define INCLUDED_CANVAS_PAGE_HXX
+#ifndef INCLUDED_SOURCE_TOOLS_PAGE_HXX
+#define INCLUDED_SOURCE_TOOLS_PAGE_HXX
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irectangle.hxx>
diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx
index 93132b503121..5078833ff1fe 100644
--- a/canvas/source/tools/pagemanager.hxx
+++ b/canvas/source/tools/pagemanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_PAGEMANAGER_HXX
-#define INCLUDED_CANVAS_PAGEMANAGER_HXX
+#ifndef INCLUDED_SOURCE_TOOLS_PAGEMANAGER_HXX
+#define INCLUDED_SOURCE_TOOLS_PAGEMANAGER_HXX
 
 #include <basegfx/vector/b2isize.hxx>
 #include <canvas/rendering/irendermodule.hxx>
diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx
index b82a8869d7a2..00babdb92da7 100644
--- a/canvas/source/tools/surface.hxx
+++ b/canvas/source/tools/surface.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SURFACE_HXX
-#define INCLUDED_CANVAS_SURFACE_HXX
+#ifndef INCLUDED_SOURCE_TOOLS_SURFACE_HXX
+#define INCLUDED_SOURCE_TOOLS_SURFACE_HXX
 
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/point/b2dpoint.hxx>
diff --git a/canvas/source/tools/surfaceproxy.hxx b/canvas/source/tools/surfaceproxy.hxx
index 651a3ed7a6f2..4b4a8df2556d 100644
--- a/canvas/source/tools/surfaceproxy.hxx
+++ b/canvas/source/tools/surfaceproxy.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SURFACEPROXY_HXX
-#define INCLUDED_CANVAS_SURFACEPROXY_HXX
+#ifndef INCLUDED_SOURCE_TOOLS_SURFACEPROXY_HXX
+#define INCLUDED_SOURCE_TOOLS_SURFACEPROXY_HXX
 
 #include <canvas/rendering/isurfaceproxy.hxx>
 #include <canvas/rendering/icolorbuffer.hxx>
diff --git a/canvas/source/tools/surfacerect.hxx b/canvas/source/tools/surfacerect.hxx
index 1b2b4fcef22d..2e1453c44391 100644
--- a/canvas/source/tools/surfacerect.hxx
+++ b/canvas/source/tools/surfacerect.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SURFACERECT_HXX
-#define INCLUDED_CANVAS_SURFACERECT_HXX
+#ifndef INCLUDED_SOURCE_TOOLS_SURFACERECT_HXX
+#define INCLUDED_SOURCE_TOOLS_SURFACERECT_HXX
 
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/vector/b2isize.hxx>
diff --git a/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx
index 9d684bba54be..bdcf6260a3c1 100644
--- a/canvas/source/vcl/backbuffer.hxx
+++ b/canvas/source/vcl/backbuffer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_BACKBUFFER_HXX_
-#define _VCLCANVAS_BACKBUFFER_HXX_
+#ifndef INCLUDED_SOURCE_VCL_BACKBUFFER_HXX
+#define INCLUDED_SOURCE_VCL_BACKBUFFER_HXX
 
 #include <vcl/virdev.hxx>
 
@@ -56,6 +56,6 @@ namespace vclcanvas
     typedef ::boost::shared_ptr< BackBuffer > BackBufferSharedPtr;
 }
 
-#endif /* #ifndef _VCLCANVAS_BACKBUFFER_HXX_ */
+#endif // INCLUDED_SOURCE_VCL_BACKBUFFER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/bitmapbackbuffer.hxx b/canvas/source/vcl/bitmapbackbuffer.hxx
index 13fb008fd524..c87d25734fdf 100644
--- a/canvas/source/vcl/bitmapbackbuffer.hxx
+++ b/canvas/source/vcl/bitmapbackbuffer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_BITMAPBACKBUFFER_HXX_
-#define _VCLCANVAS_BITMAPBACKBUFFER_HXX_
+#ifndef INCLUDED_SOURCE_VCL_BITMAPBACKBUFFER_HXX
+#define INCLUDED_SOURCE_VCL_BITMAPBACKBUFFER_HXX
 
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
@@ -92,6 +92,6 @@ namespace vclcanvas
 
 }
 
-#endif /* #ifndef _VCLCANVAS_BITMAPBACKBUFFER_HXX_ */
+#endif // INCLUDED_SOURCE_VCL_BITMAPBACKBUFFER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/cachedbitmap.hxx b/canvas/source/vcl/cachedbitmap.hxx
index 948fdd3aa4ff..0f405c52c878 100644
--- a/canvas/source/vcl/cachedbitmap.hxx
+++ b/canvas/source/vcl/cachedbitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CACHEDBITMAP_HXX
-#define _VCLCANVAS_CACHEDBITMAP_HXX
+#ifndef INCLUDED_SOURCE_VCL_CACHEDBITMAP_HXX
+#define INCLUDED_SOURCE_VCL_CACHEDBITMAP_HXX
 
 #include <canvas/base/cachedprimitivebase.hxx>
 
@@ -67,6 +67,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_CACHEDBITMAP_HXX */
+#endif // INCLUDED_SOURCE_VCL_CACHEDBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 10bee3b48783..4e43d279b176 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVAS_HXX_
-#define _VCLCANVAS_CANVAS_HXX_
+#ifndef INCLUDED_SOURCE_VCL_CANVAS_HXX
+#define INCLUDED_SOURCE_VCL_CANVAS_HXX
 
 #include <rtl/ref.hxx>
 
diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx
index 176d4faea3bf..517ca982c75f 100644
--- a/canvas/source/vcl/canvasbitmap.hxx
+++ b/canvas/source/vcl/canvasbitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVASBITMAP_HXX
-#define _VCLCANVAS_CANVASBITMAP_HXX
+#ifndef INCLUDED_SOURCE_VCL_CANVASBITMAP_HXX
+#define INCLUDED_SOURCE_VCL_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase4.hxx>
 
@@ -115,6 +115,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_CANVASBITMAP_HXX */
+#endif // INCLUDED_SOURCE_VCL_CANVASBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx
index 9a0736273b0d..fcca5cec1c8d 100644
--- a/canvas/source/vcl/canvasbitmaphelper.hxx
+++ b/canvas/source/vcl/canvasbitmaphelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVASBITMAPHELPER_HXX_
-#define _VCLCANVAS_CANVASBITMAPHELPER_HXX_
+#ifndef INCLUDED_SOURCE_VCL_CANVASBITMAPHELPER_HXX
+#define INCLUDED_SOURCE_VCL_CANVASBITMAPHELPER_HXX
 
 #include <canvashelper.hxx>
 #include <canvas/vclwrapper.hxx>
@@ -118,6 +118,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_CANVASBITMAPHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_VCL_CANVASBITMAPHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx
index 0014c3f91392..c2b66dd71d4c 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVASCUSTOMSPRITE_HXX
-#define _VCLCANVAS_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase4.hxx>
 #include <comphelper/uno3.hxx>
@@ -120,6 +120,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_CANVASCUSTOMSPRITE_HXX */
+#endif // INCLUDED_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index c22a193f1c5c..02686d745934 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVASFONT_HXX
-#define _VCLCANVAS_CANVASFONT_HXX
+#ifndef INCLUDED_SOURCE_VCL_CANVASFONT_HXX
+#define INCLUDED_SOURCE_VCL_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
@@ -89,6 +89,6 @@ namespace vclcanvas
 
 }
 
-#endif /* _VCLCANVAS_CANVASFONT_HXX */
+#endif // INCLUDED_SOURCE_VCL_CANVASFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx
index 69af00c13d6c..c4d8b2be3dc6 100644
--- a/canvas/source/vcl/canvashelper.hxx
+++ b/canvas/source/vcl/canvashelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVASHELPER_HXX_
-#define _VCLCANVAS_CANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_VCL_CANVASHELPER_HXX
+#define INCLUDED_SOURCE_VCL_CANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -334,6 +334,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_CANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_VCL_CANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/devicehelper.hxx b/canvas/source/vcl/devicehelper.hxx
index dd841bb982f6..c2933fb9bbe2 100644
--- a/canvas/source/vcl/devicehelper.hxx
+++ b/canvas/source/vcl/devicehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_DEVICEHELPER_HXX
-#define _VCLCANVAS_DEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_VCL_DEVICEHELPER_HXX
+#define INCLUDED_SOURCE_VCL_DEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
@@ -90,6 +90,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_DEVICEHELPER_HXX */
+#endif // INCLUDED_SOURCE_VCL_DEVICEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index 7b481c4ab23a..7cbd4df2e3c1 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_TOOLS_HXX
-#define _VCLCANVAS_TOOLS_HXX
+#ifndef INCLUDED_SOURCE_VCL_IMPLTOOLS_HXX
+#define INCLUDED_SOURCE_VCL_IMPLTOOLS_HXX
 
 #include <osl/mutex.hxx>
 
@@ -186,6 +186,6 @@ namespace vclcanvas
     }
 }
 
-#endif /* _VCLCANVAS_TOOLS_HXX */
+#endif // INCLUDED_SOURCE_VCL_IMPLTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/outdevprovider.hxx b/canvas/source/vcl/outdevprovider.hxx
index 487f6b26b2a6..326be86d810a 100644
--- a/canvas/source/vcl/outdevprovider.hxx
+++ b/canvas/source/vcl/outdevprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_OUTDEVPROVIDER_HXX
-#define _VCLCANVAS_OUTDEVPROVIDER_HXX
+#ifndef INCLUDED_SOURCE_VCL_OUTDEVPROVIDER_HXX
+#define INCLUDED_SOURCE_VCL_OUTDEVPROVIDER_HXX
 
 #include <sal/types.h>
 #include <boost/shared_ptr.hpp>
@@ -50,6 +50,6 @@ namespace vclcanvas
     typedef ::boost::shared_ptr< OutDevProvider > OutDevProviderSharedPtr;
 }
 
-#endif /* _VCLCANVAS_OUTDEVPROVIDER_HXX */
+#endif // INCLUDED_SOURCE_VCL_OUTDEVPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/repainttarget.hxx b/canvas/source/vcl/repainttarget.hxx
index 84363da81e99..c95b1824b394 100644
--- a/canvas/source/vcl/repainttarget.hxx
+++ b/canvas/source/vcl/repainttarget.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_REPAINTTARGET_HXX
-#define _VCLCANVAS_REPAINTTARGET_HXX
+#ifndef INCLUDED_SOURCE_VCL_REPAINTTARGET_HXX
+#define INCLUDED_SOURCE_VCL_REPAINTTARGET_HXX
 
 #include <rtl/ref.hxx>
 
@@ -52,6 +52,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_REPAINTTARGET_HXX */
+#endif // INCLUDED_SOURCE_VCL_REPAINTTARGET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/sprite.hxx b/canvas/source/vcl/sprite.hxx
index 71fb71b6075f..6928e4c3d998 100644
--- a/canvas/source/vcl/sprite.hxx
+++ b/canvas/source/vcl/sprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCLCANVAS_SPRITE_HXX
-#define INCLUDED_VCLCANVAS_SPRITE_HXX
+#ifndef INCLUDED_SOURCE_VCL_SPRITE_HXX
+#define INCLUDED_SOURCE_VCL_SPRITE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -63,6 +63,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* INCLUDED_VCLCANVAS_SPRITE_HXX */
+#endif // INCLUDED_SOURCE_VCL_SPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index 5ca1f77d25f0..c465b62b3949 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_SPRITECANVAS_HXX_
-#define _VCLCANVAS_SPRITECANVAS_HXX_
+#ifndef INCLUDED_SOURCE_VCL_SPRITECANVAS_HXX
+#define INCLUDED_SOURCE_VCL_SPRITECANVAS_HXX
 
 #include <rtl/ref.hxx>
 
diff --git a/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx
index 7a598e2da868..1a78f4f52884 100644
--- a/canvas/source/vcl/spritecanvashelper.hxx
+++ b/canvas/source/vcl/spritecanvashelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_SPRITECANVASHELPER_HXX_
-#define _VCLCANVAS_SPRITECANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_VCL_SPRITECANVASHELPER_HXX
+#define INCLUDED_SOURCE_VCL_SPRITECANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
@@ -166,6 +166,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_SPRITECANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_VCL_SPRITECANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/spritedevicehelper.hxx b/canvas/source/vcl/spritedevicehelper.hxx
index 926fee34ab48..253c7d00b04f 100644
--- a/canvas/source/vcl/spritedevicehelper.hxx
+++ b/canvas/source/vcl/spritedevicehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_SPRITEDEVICEHELPER_HXX
-#define _VCLCANVAS_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
@@ -68,6 +68,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_SPRITEDEVICEHELPER_HXX */
+#endif // INCLUDED_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/spritehelper.hxx b/canvas/source/vcl/spritehelper.hxx
index 169ed761711b..a2622002e08d 100644
--- a/canvas/source/vcl/spritehelper.hxx
+++ b/canvas/source/vcl/spritehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_SPRITEHELPER_HXX
-#define _VCLCANVAS_SPRITEHELPER_HXX
+#ifndef INCLUDED_SOURCE_VCL_SPRITEHELPER_HXX
+#define INCLUDED_SOURCE_VCL_SPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 
@@ -110,6 +110,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_SPRITEHELPER_HXX */
+#endif // INCLUDED_SOURCE_VCL_SPRITEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index f48054826d93..b97f18540cbf 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_TEXTLAYOUT_HXX
-#define _VCLCANVAS_TEXTLAYOUT_HXX
+#ifndef INCLUDED_SOURCE_VCL_TEXTLAYOUT_HXX
+#define INCLUDED_SOURCE_VCL_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -104,6 +104,6 @@ namespace vclcanvas
 
 }
 
-#endif /* _VCLCANVAS_TEXTLAYOUT_HXX */
+#endif // INCLUDED_SOURCE_VCL_TEXTLAYOUT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/windowoutdevholder.hxx b/canvas/source/vcl/windowoutdevholder.hxx
index dc538f500f34..5f3f32541070 100644
--- a/canvas/source/vcl/windowoutdevholder.hxx
+++ b/canvas/source/vcl/windowoutdevholder.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_WINDOWOUTDEVHOLDER_HXX
-#define _VCLCANVAS_WINDOWOUTDEVHOLDER_HXX
+#ifndef INCLUDED_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
+#define INCLUDED_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
@@ -55,6 +55,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_WINDOWOUTDEVHOLDER_HXX */
+#endif // INCLUDED_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */