12 files changed, 24 insertions, 24 deletions
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
index 50781c3bb491..328fb5723068 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_BITMAPCANVASHELPER_HXX_
-#define OGL_BITMAPCANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx
index b9964126f025..587fff9b4bfd 100644
--- a/canvas/source/opengl/ogl_buffercontext.hxx
+++ b/canvas/source/opengl/ogl_buffercontext.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_BUFFERCONTEXT_HXX_
-#define OGL_BUFFERCONTEXT_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
 
 #include <sal/config.h>
 #include <boost/shared_ptr.hpp>
diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx
index b874bde8da42..d7f840a8c942 100644
--- a/canvas/source/opengl/ogl_canvasbitmap.hxx
+++ b/canvas/source/opengl/ogl_canvasbitmap.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASBITMAP_HXX
-#define OGL_CANVASBITMAP_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase2.hxx>
 
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx
index a96ce6494d08..c25ee865b2e8 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.hxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASCUSTOMSPRITE_HXX
-#define OGL_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index 9a262975cf11..041e87bac4b6 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASFONT_HXX
-#define OGL_CANVASFONT_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASFONT_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx
index b7280ac1c9a1..98ee6733ed4b 100644
--- a/canvas/source/opengl/ogl_canvashelper.hxx
+++ b/canvas/source/opengl/ogl_canvashelper.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASHELPER_HXX_
-#define OGL_CANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASHELPER_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 
diff --git a/canvas/source/opengl/ogl_canvastools.hxx b/canvas/source/opengl/ogl_canvastools.hxx
index 458bddd1d1e6..43a14bde4be8 100644
--- a/canvas/source/opengl/ogl_canvastools.hxx
+++ b/canvas/source/opengl/ogl_canvastools.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASTOOLS_HXX
-#define OGL_CANVASTOOLS_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX
 
 #include <sal/config.h>
 #include <vector>
diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx
index 6efc6dbe8fb1..52be9f955915 100644
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_SPRITECANVAS_HXX_
-#define OGL_SPRITECANVAS_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX
 
 #include <rtl/ref.hxx>
 
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index c87bdf84d18f..9db73df8795a 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_SPRITEDEVICEHELPER_HXX
-#define OGL_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX
 
 #include <rtl/ref.hxx>
 #include <canvas/elapsedtime.hxx>
diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx
index 64c50f7f2bb8..590be59b5967 100644
--- a/canvas/source/opengl/ogl_textlayout.hxx
+++ b/canvas/source/opengl/ogl_textlayout.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_TEXTLAYOUT_HXX
-#define OGL_TEXTLAYOUT_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
diff --git a/canvas/source/opengl/ogl_texturecache.hxx b/canvas/source/opengl/ogl_texturecache.hxx
index 50d025a21b89..e80b57482def 100644
--- a/canvas/source/opengl/ogl_texturecache.hxx
+++ b/canvas/source/opengl/ogl_texturecache.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_TEXTURECACHE_HXX
-#define OGL_TEXTURECACHE_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX
 
 #include <sal/types.h>
 #include <boost/unordered_map.hpp>
diff --git a/canvas/source/opengl/ogl_tools.hxx b/canvas/source/opengl/ogl_tools.hxx
index d61ab45dd447..c9a22813522c 100644
--- a/canvas/source/opengl/ogl_tools.hxx
+++ b/canvas/source/opengl/ogl_tools.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVAS_TOOLS_HXX
-#define OGL_CANVAS_TOOLS_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_TOOLS_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_TOOLS_HXX
 
 #include <sal/config.h>
 #include <GL/gl.h>