fixincludeguards.sh: canvas

Change-Id: I2fb527c2cb5814b15862144baf3783d226e675ef

27 files changed, 74 insertions, 74 deletions

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: */