fixincludeguards.sh: canvas

Change-Id: I2fb527c2cb5814b15862144baf3783d226e675ef

83 files changed, 214 insertions, 214 deletions

diff --git a/canvas/source/cairo/cairo_cachedbitmap.hxx b/canvas/source/cairo/cairo_cachedbitmap.hxx
index 997f70c73168..76db00db49a7 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 INCLUDED_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
+#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
 
 #include <canvas/base/cachedprimitivebase.hxx>
 
@@ -56,6 +56,6 @@ namespace cairocanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
+#endif // INCLUDED_CANVAS_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 41df12b8ced1..b971988333d1 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 INCLUDED_SOURCE_CAIRO_CAIRO_CAIRO_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_CAIRO_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CAIRO_HXX
+#define INCLUDED_CANVAS_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 449db29d233c..d3d64b668350 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 INCLUDED_SOURCE_CAIRO_CAIRO_CANVAS_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVAS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVAS_HXX
+#define INCLUDED_CANVAS_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 7f725bfe89b0..e26aa61070f5 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 INCLUDED_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
+#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase4.hxx>
 
@@ -127,6 +127,6 @@ namespace cairocanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
+#endif // INCLUDED_CANVAS_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 da5a9db84313..f9123d9c114d 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 INCLUDED_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase4.hxx>
 #include <comphelper/uno3.hxx>
@@ -145,6 +145,6 @@ namespace cairocanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
+#endif // INCLUDED_CANVAS_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 f36fe100f1e6..8d31a7d9bbbe 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 INCLUDED_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
+#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
@@ -85,6 +85,6 @@ namespace cairocanvas
 
 }
 
-#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
+#endif // INCLUDED_CANVAS_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 10085bac9a2f..cc659864bec3 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 INCLUDED_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
+#endif // INCLUDED_CANVAS_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 08de5c636dd6..bf9bcd4122e3 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 INCLUDED_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX
+#define INCLUDED_CANVAS_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 9fcd67bcfc50..cbcbf2786e75 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 INCLUDED_SOURCE_CAIRO_CAIRO_QUARTZ_CAIRO_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_QUARTZ_CAIRO_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_QUARTZ_CAIRO_HXX
+#define INCLUDED_CANVAS_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 ab7f32976a66..5693658cc4c8 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 INCLUDED_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
+#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
 
 #include <rtl/ref.hxx>
 
@@ -47,6 +47,6 @@ namespace cairocanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
+#endif // INCLUDED_CANVAS_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 c63d42dc887a..d2171db3dac6 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 INCLUDED_SOURCE_CAIRO_CAIRO_SPRITE_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITE_HXX
+#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -63,6 +63,6 @@ namespace cairocanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_CAIRO_CAIRO_SPRITE_HXX
+#endif // INCLUDED_CANVAS_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 0b622db0310c..5ff69cd8c710 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 INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVAS_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVAS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITECANVAS_HXX
+#define INCLUDED_CANVAS_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 39ff6741faaa..b18747e97250 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 INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
+#endif // INCLUDED_CANVAS_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 b8d82db29a8b..e5959460a480 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 INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_CANVAS_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 8a05608029d5..946b370bdf89 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 INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
+#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 
@@ -104,6 +104,6 @@ namespace cairocanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
+#endif // INCLUDED_CANVAS_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 d7b07a7ba9db..24baad100f4c 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 INCLUDED_SOURCE_CAIRO_CAIRO_SURFACEPROVIDER_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_SURFACEPROVIDER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SURFACEPROVIDER_HXX
+#define INCLUDED_CANVAS_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 0dcd32d0ab09..df2a722186ec 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 INCLUDED_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
+#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -107,6 +107,6 @@ namespace cairocanvas
 
 }
 
-#endif // INCLUDED_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
+#endif // INCLUDED_CANVAS_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 59b7448cecad..c6f4d7ea0051 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 INCLUDED_SOURCE_CAIRO_CAIRO_WIN32_CAIRO_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_WIN32_CAIRO_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_WIN32_CAIRO_HXX
+#define INCLUDED_CANVAS_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 fa86ceaa5716..78e548641c47 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 INCLUDED_SOURCE_CAIRO_CAIRO_XLIB_CAIRO_HXX
-#define INCLUDED_SOURCE_CAIRO_CAIRO_XLIB_CAIRO_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_XLIB_CAIRO_HXX
+#define INCLUDED_CANVAS_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 2f57663db245..c9236f8263e1 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 INCLUDED_SOURCE_DIRECTX_DX_BITMAP_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_BITMAP_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAP_HXX
+#define INCLUDED_CANVAS_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 cbfd7eef605d..163c37fd7e55 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 INCLUDED_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX
+#endif // INCLUDED_CANVAS_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 bf83fd19bb53..1c9ae8f839c6 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 INCLUDED_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX
+#define INCLUDED_CANVAS_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 d6574ac70fd7..fc23d09ca22c 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 INCLUDED_SOURCE_DIRECTX_DX_CANVAS_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_CANVAS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVAS_HXX
+#define INCLUDED_CANVAS_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 2396468d6ed5..a59228e35a29 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 INCLUDED_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase4.hxx>
 
@@ -93,6 +93,6 @@ namespace dxcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
+#endif // INCLUDED_CANVAS_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 f297056cefa0..ec25ab18c578 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 INCLUDED_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase4.hxx>
 #include <comphelper/uno3.hxx>
@@ -128,6 +128,6 @@ namespace dxcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
+#endif // INCLUDED_CANVAS_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 bfeb7d362715..0049d2e6b0c6 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 INCLUDED_SOURCE_DIRECTX_DX_CANVASFONT_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_CANVASFONT_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
@@ -91,6 +91,6 @@ namespace dxcanvas
 
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASFONT_HXX
+#endif // INCLUDED_CANVAS_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 b1eb5cfb8206..69c692a3c784 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 INCLUDED_SOURCE_DIRECTX_DX_CANVASHELPER_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_CANVASHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_DIRECTX_DX_CANVASHELPER_HXX
+#endif // INCLUDED_CANVAS_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 40fe22fbe908..34707ef8d038 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 INCLUDED_SOURCE_DIRECTX_DX_CONFIG_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_CONFIG_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CONFIG_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CONFIG_HXX
 
 #include <unotools/configitem.hxx>
 #include <boost/optional.hpp>
@@ -78,6 +78,6 @@ namespace dxcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_CONFIG_HXX
+#endif // INCLUDED_CANVAS_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 6bd32f040dfe..8c674131f755 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 INCLUDED_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX
+#endif // INCLUDED_CANVAS_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 c78877f77dad..2f11574b63fb 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 INCLUDED_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
 
 #include <sal/config.h>
 
@@ -44,6 +44,6 @@ namespace dxcanvas
 
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
+#endif // INCLUDED_CANVAS_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 3e2ba845de36..4a098b5c40c3 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 INCLUDED_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
 
 #include "dx_winstuff.hxx"
 
@@ -42,6 +42,6 @@ namespace dxcanvas
     typedef ::boost::shared_ptr< GraphicsProvider > GraphicsProviderSharedPtr;
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
+#endif // INCLUDED_CANVAS_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 d37087a37a60..530e61577596 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 INCLUDED_SOURCE_DIRECTX_DX_IBITMAP_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_IBITMAP_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_IBITMAP_HXX
+#define INCLUDED_CANVAS_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 99cf7efd9388..41e44bce6f76 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 INCLUDED_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
+#endif // INCLUDED_CANVAS_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 1b44110b28d5..e1fae545328e 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 INCLUDED_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
 
 #include <canvas/canvastools.hxx>
 #include <basegfx/tools/unopolypolygon.hxx>
@@ -45,6 +45,6 @@ namespace dxcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
+#endif // INCLUDED_CANVAS_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 7f3f46edf098..f15d3d3bd01e 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 INCLUDED_SOURCE_DIRECTX_DX_RENDERMODULE_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_RENDERMODULE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_RENDERMODULE_HXX
+#define INCLUDED_CANVAS_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 7ac2cd650898..2c014a5530df 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_SOURCE_DIRECTX_DX_SPRITE_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_SPRITE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITE_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -40,6 +40,6 @@ namespace dxcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_SPRITE_HXX
+#endif // INCLUDED_CANVAS_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 1859f88e9a3a..18966f151c49 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 INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVAS_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVAS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITECANVAS_HXX
+#define INCLUDED_CANVAS_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 bb2eb5273cd0..f11986119c0d 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 INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX
+#endif // INCLUDED_CANVAS_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 41a2f4afa9c3..4c33627aeab2 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 INCLUDED_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX
+#endif // INCLUDED_CANVAS_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 bf9a8216aaba..ced65e150a68 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 INCLUDED_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 
@@ -100,6 +100,6 @@ namespace dxcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
+#endif // INCLUDED_CANVAS_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 7df4a651a9d1..fa3770733ca8 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 INCLUDED_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX
+#define INCLUDED_CANVAS_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 f06de843605c..930add339333 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 INCLUDED_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
 
 #include "dx_graphicsprovider.hxx"
 
@@ -34,6 +34,6 @@ namespace dxcanvas
     GraphicsSharedPtr createSurfaceGraphics(const COMReference<surface_type>& rSurface );
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
+#endif // INCLUDED_CANVAS_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 c750e503e0d0..25986f4e8941 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 INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -102,6 +102,6 @@ namespace dxcanvas
 
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
+#endif // INCLUDED_CANVAS_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 369e4065b743..03f3b6def45a 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 INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
 
 #include <boost/shared_ptr.hpp>
 
@@ -74,6 +74,6 @@ namespace dxcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
+#endif // INCLUDED_CANVAS_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 6187ed4adf05..8659284c4db8 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 INCLUDED_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
+#endif // INCLUDED_CANVAS_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 368045a57281..30f616dda0ad 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 INCLUDED_SOURCE_DIRECTX_DX_WINSTUFF_HXX
-#define INCLUDED_SOURCE_DIRECTX_DX_WINSTUFF_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX
+#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX
 
 #include <algorithm>
 
@@ -214,6 +214,6 @@ namespace dxcanvas
 #undef DELETE
 #undef PolyPolygon
 
-#endif // INCLUDED_SOURCE_DIRECTX_DX_WINSTUFF_HXX
+#endif // INCLUDED_CANVAS_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 328fb5723068..2af8dd0b29a6 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 INCLUDED_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
+#define INCLUDED_CANVAS_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 587fff9b4bfd..7d85e9a3791d 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 INCLUDED_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
+#define INCLUDED_CANVAS_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 d7f840a8c942..876a7615c35d 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 INCLUDED_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
+#define INCLUDED_CANVAS_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 c25ee865b2e8..5e52609cb82b 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 INCLUDED_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_CANVAS_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 041e87bac4b6..88cdf1691de0 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 INCLUDED_SOURCE_OPENGL_OGL_CANVASFONT_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_CANVASFONT_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX
+#define INCLUDED_CANVAS_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 98ee6733ed4b..7b482e0df726 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 INCLUDED_SOURCE_OPENGL_OGL_CANVASHELPER_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_CANVASHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASHELPER_HXX
+#define INCLUDED_CANVAS_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 43a14bde4be8..2cd727c6735c 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 INCLUDED_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX
+#define INCLUDED_CANVAS_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 52be9f955915..f4bc534883e8 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 INCLUDED_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX
+#define INCLUDED_CANVAS_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 9db73df8795a..aa8172564f0b 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 INCLUDED_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_CANVAS_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 590be59b5967..5938ef0e4c25 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 INCLUDED_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
+#define INCLUDED_CANVAS_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 e80b57482def..dbc6c459dd1f 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 INCLUDED_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX
+#define INCLUDED_CANVAS_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 c9a22813522c..6c23be7c9236 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 INCLUDED_SOURCE_OPENGL_OGL_TOOLS_HXX
-#define INCLUDED_SOURCE_OPENGL_OGL_TOOLS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TOOLS_HXX
+#define INCLUDED_CANVAS_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 094912c3f0b7..d4a0f8422bee 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_SOURCE_TOOLS_PAGE_HXX
-#define INCLUDED_SOURCE_TOOLS_PAGE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_TOOLS_PAGE_HXX
+#define INCLUDED_CANVAS_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 5078833ff1fe..55025551f84e 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_SOURCE_TOOLS_PAGEMANAGER_HXX
-#define INCLUDED_SOURCE_TOOLS_PAGEMANAGER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_TOOLS_PAGEMANAGER_HXX
+#define INCLUDED_CANVAS_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 00babdb92da7..294662e329b3 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_SOURCE_TOOLS_SURFACE_HXX
-#define INCLUDED_SOURCE_TOOLS_SURFACE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_TOOLS_SURFACE_HXX
+#define INCLUDED_CANVAS_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 4b4a8df2556d..fd3a79386a4d 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_SOURCE_TOOLS_SURFACEPROXY_HXX
-#define INCLUDED_SOURCE_TOOLS_SURFACEPROXY_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_TOOLS_SURFACEPROXY_HXX
+#define INCLUDED_CANVAS_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 2e1453c44391..551bbc273d17 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_SOURCE_TOOLS_SURFACERECT_HXX
-#define INCLUDED_SOURCE_TOOLS_SURFACERECT_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_TOOLS_SURFACERECT_HXX
+#define INCLUDED_CANVAS_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 bdcf6260a3c1..d834681fb447 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 INCLUDED_SOURCE_VCL_BACKBUFFER_HXX
-#define INCLUDED_SOURCE_VCL_BACKBUFFER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_BACKBUFFER_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_BACKBUFFER_HXX
 
 #include <vcl/virdev.hxx>
 
@@ -56,6 +56,6 @@ namespace vclcanvas
     typedef ::boost::shared_ptr< BackBuffer > BackBufferSharedPtr;
 }
 
-#endif // INCLUDED_SOURCE_VCL_BACKBUFFER_HXX
+#endif // INCLUDED_CANVAS_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 c87d25734fdf..ea670b9c29cc 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 INCLUDED_SOURCE_VCL_BITMAPBACKBUFFER_HXX
-#define INCLUDED_SOURCE_VCL_BITMAPBACKBUFFER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_BITMAPBACKBUFFER_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_BITMAPBACKBUFFER_HXX
 
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
@@ -92,6 +92,6 @@ namespace vclcanvas
 
 }
 
-#endif // INCLUDED_SOURCE_VCL_BITMAPBACKBUFFER_HXX
+#endif // INCLUDED_CANVAS_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 0f405c52c878..9ec537c276b3 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 INCLUDED_SOURCE_VCL_CACHEDBITMAP_HXX
-#define INCLUDED_SOURCE_VCL_CACHEDBITMAP_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_CACHEDBITMAP_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_CACHEDBITMAP_HXX
 
 #include <canvas/base/cachedprimitivebase.hxx>
 
@@ -67,6 +67,6 @@ namespace vclcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_VCL_CACHEDBITMAP_HXX
+#endif // INCLUDED_CANVAS_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 4e43d279b176..71c010f80a63 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 INCLUDED_SOURCE_VCL_CANVAS_HXX
-#define INCLUDED_SOURCE_VCL_CANVAS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVAS_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_CANVAS_HXX
 
 #include <rtl/ref.hxx>
 
diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx
index 517ca982c75f..9d2764d1b145 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 INCLUDED_SOURCE_VCL_CANVASBITMAP_HXX
-#define INCLUDED_SOURCE_VCL_CANVASBITMAP_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAP_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase4.hxx>
 
@@ -115,6 +115,6 @@ namespace vclcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_VCL_CANVASBITMAP_HXX
+#endif // INCLUDED_CANVAS_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 fcca5cec1c8d..ddd958ac661d 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 INCLUDED_SOURCE_VCL_CANVASBITMAPHELPER_HXX
-#define INCLUDED_SOURCE_VCL_CANVASBITMAPHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAPHELPER_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAPHELPER_HXX
 
 #include <canvashelper.hxx>
 #include <canvas/vclwrapper.hxx>
@@ -118,6 +118,6 @@ namespace vclcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_VCL_CANVASBITMAPHELPER_HXX
+#endif // INCLUDED_CANVAS_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 c2b66dd71d4c..90c3dd74e36e 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 INCLUDED_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
-#define INCLUDED_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase4.hxx>
 #include <comphelper/uno3.hxx>
@@ -120,6 +120,6 @@ namespace vclcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
+#endif // INCLUDED_CANVAS_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 02686d745934..c5bb892ac79b 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 INCLUDED_SOURCE_VCL_CANVASFONT_HXX
-#define INCLUDED_SOURCE_VCL_CANVASFONT_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
@@ -89,6 +89,6 @@ namespace vclcanvas
 
 }
 
-#endif // INCLUDED_SOURCE_VCL_CANVASFONT_HXX
+#endif // INCLUDED_CANVAS_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 c4d8b2be3dc6..3c35684ffa78 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 INCLUDED_SOURCE_VCL_CANVASHELPER_HXX
-#define INCLUDED_SOURCE_VCL_CANVASHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_VCL_CANVASHELPER_HXX
+#endif // INCLUDED_CANVAS_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 c2933fb9bbe2..821e78d6ffbb 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 INCLUDED_SOURCE_VCL_DEVICEHELPER_HXX
-#define INCLUDED_SOURCE_VCL_DEVICEHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_DEVICEHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_VCL_DEVICEHELPER_HXX
+#endif // INCLUDED_CANVAS_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 7cbd4df2e3c1..d017ebf87e64 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 INCLUDED_SOURCE_VCL_IMPLTOOLS_HXX
-#define INCLUDED_SOURCE_VCL_IMPLTOOLS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_IMPLTOOLS_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_IMPLTOOLS_HXX
 
 #include <osl/mutex.hxx>
 
@@ -186,6 +186,6 @@ namespace vclcanvas
     }
 }
 
-#endif // INCLUDED_SOURCE_VCL_IMPLTOOLS_HXX
+#endif // INCLUDED_CANVAS_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 326be86d810a..37c48c63a36e 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 INCLUDED_SOURCE_VCL_OUTDEVPROVIDER_HXX
-#define INCLUDED_SOURCE_VCL_OUTDEVPROVIDER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_VCL_OUTDEVPROVIDER_HXX
+#endif // INCLUDED_CANVAS_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 c95b1824b394..c959087aa7b6 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 INCLUDED_SOURCE_VCL_REPAINTTARGET_HXX
-#define INCLUDED_SOURCE_VCL_REPAINTTARGET_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_REPAINTTARGET_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_REPAINTTARGET_HXX
 
 #include <rtl/ref.hxx>
 
@@ -52,6 +52,6 @@ namespace vclcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_VCL_REPAINTTARGET_HXX
+#endif // INCLUDED_CANVAS_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 6928e4c3d998..c7de3575169b 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_SOURCE_VCL_SPRITE_HXX
-#define INCLUDED_SOURCE_VCL_SPRITE_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITE_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_SPRITE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -63,6 +63,6 @@ namespace vclcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_VCL_SPRITE_HXX
+#endif // INCLUDED_CANVAS_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 c465b62b3949..cb57d8f57503 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 INCLUDED_SOURCE_VCL_SPRITECANVAS_HXX
-#define INCLUDED_SOURCE_VCL_SPRITECANVAS_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVAS_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVAS_HXX
 
 #include <rtl/ref.hxx>
 
diff --git a/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx
index 1a78f4f52884..e1d64bd8e754 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 INCLUDED_SOURCE_VCL_SPRITECANVASHELPER_HXX
-#define INCLUDED_SOURCE_VCL_SPRITECANVASHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVASHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_VCL_SPRITECANVASHELPER_HXX
+#endif // INCLUDED_CANVAS_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 253c7d00b04f..bf97638495b9 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 INCLUDED_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
-#define INCLUDED_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
+#endif // INCLUDED_CANVAS_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 a2622002e08d..d20817b6032a 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 INCLUDED_SOURCE_VCL_SPRITEHELPER_HXX
-#define INCLUDED_SOURCE_VCL_SPRITEHELPER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITEHELPER_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_SPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 
@@ -110,6 +110,6 @@ namespace vclcanvas
     };
 }
 
-#endif // INCLUDED_SOURCE_VCL_SPRITEHELPER_HXX
+#endif // INCLUDED_CANVAS_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 b97f18540cbf..59608a7e296a 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 INCLUDED_SOURCE_VCL_TEXTLAYOUT_HXX
-#define INCLUDED_SOURCE_VCL_TEXTLAYOUT_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_TEXTLAYOUT_HXX
+#define INCLUDED_CANVAS_SOURCE_VCL_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -104,6 +104,6 @@ namespace vclcanvas
 
 }
 
-#endif // INCLUDED_SOURCE_VCL_TEXTLAYOUT_HXX
+#endif // INCLUDED_CANVAS_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 5f3f32541070..89b549b9b622 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 INCLUDED_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
-#define INCLUDED_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
+#ifndef INCLUDED_CANVAS_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
+#define INCLUDED_CANVAS_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 // INCLUDED_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
+#endif // INCLUDED_CANVAS_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */