20 files changed, 58 insertions, 58 deletions
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: */