Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

23 files changed, 68 insertions, 68 deletions

diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index 3beaa8ce2b05..c47bb29e6c20 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_ACTION_HXX
-#define _CPPCANVAS_ACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_INC_ACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_INC_ACTION_HXX
 
 #include <sal/types.h>
 
@@ -151,6 +151,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_ACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_INC_ACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index ec607aed8169..e408e490aba4 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_CANVASGRAPHICHELPER_HXX
-#define _CPPCANVAS_CANVASGRAPHICHELPER_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_INC_CANVASGRAPHICHELPER_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_INC_CANVASGRAPHICHELPER_HXX
 
 #include <com/sun/star/rendering/RenderState.hpp>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -73,6 +73,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_CANVASGRAPHICHELPER_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_INC_CANVASGRAPHICHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 9048c446d3c7..76a86c882dce 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLRENDERER_HXX
-#define _CPPCANVAS_IMPLRENDERER_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX
 
 #include <sal/types.h>
 
@@ -348,6 +348,6 @@ static float GetSwapFloat( SvStream& rSt )
     }
 }
 
-#endif /* _CPPCANVAS_IMPLRENDERER_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx
index 26e10263a369..d1e8c1f837e9 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_OUTDEVSTATE_HXX
-#define _CPPCANVAS_OUTDEVSTATE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_INC_OUTDEVSTATE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_INC_OUTDEVSTATE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -121,6 +121,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_OUTDEVSTATE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_INC_OUTDEVSTATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index f1d60ed8b159..b55f2c8582c1 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_TOOLS_HXX
-#define _CPPCANVAS_TOOLS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_INC_TOOLS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_INC_TOOLS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -45,6 +45,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_TOOLS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_INC_TOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.hxx b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
index f96074795f37..f2439da8966e 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.hxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_BITMAPACTION_HXX
-#define _CPPCANVAS_BITMAPACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_BITMAPACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_BITMAPACTION_HXX
 
 #include <cppcanvas/canvas.hxx>
 #include <action.hxx>
@@ -70,6 +70,6 @@ namespace cppcanvas
     }
 }
 
-#endif /*_CPPCANVAS_BITMAPACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_BITMAPACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 5a86f5af804d..f6377d5645f0 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_CACHEDPRIMITIVEBASE_HXX
-#define _CPPCANVAS_CACHEDPRIMITIVEBASE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_CACHEDPRIMITIVEBASE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_CACHEDPRIMITIVEBASE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XCanvas.hpp>
@@ -84,6 +84,6 @@ namespace cppcanvas
     }
 }
 
-#endif /*_CPPCANVAS_CACHEDPRIMITIVEBASE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_CACHEDPRIMITIVEBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/lineaction.hxx b/cppcanvas/source/mtfrenderer/lineaction.hxx
index 101c598c32a1..a755c5964aed 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.hxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_LINEACTION_HXX
-#define _CPPCANVAS_LINEACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_LINEACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_LINEACTION_HXX
 
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
@@ -62,6 +62,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_LINEACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_LINEACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/mtftools.hxx b/cppcanvas/source/mtfrenderer/mtftools.hxx
index 323b11e432e7..42e1db34128d 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.hxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_RENDERER_MTFTOOLS_HXX
-#define _CPPCANVAS_RENDERER_MTFTOOLS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_MTFTOOLS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_MTFTOOLS_HXX
 
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
@@ -202,6 +202,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_RENDERER_MTFTOOLS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_MTFTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/pointaction.hxx b/cppcanvas/source/mtfrenderer/pointaction.hxx
index 1487cfe65b9a..f71ea9eaf8bf 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.hxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_POINTACTION_HXX
-#define _CPPCANVAS_POINTACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POINTACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POINTACTION_HXX
 
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
@@ -67,6 +67,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_POINTACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POINTACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index 47c4e91c204c..a81e8738bb06 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_POLYPOLYACTION_HXX
-#define _CPPCANVAS_POLYPOLYACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POLYPOLYACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POLYPOLYACTION_HXX
 
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
@@ -90,6 +90,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_POLYPOLYACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POLYPOLYACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index f40f03ee6787..7afe47aeba01 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_TEXTACTION_HXX
-#define _CPPCANVAS_TEXTACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TEXTACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TEXTACTION_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -90,6 +90,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_TEXTACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TEXTACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
index 221864dbb3f1..21937485dcd4 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_TRANSPARENCYGROUPACTION_HXX
-#define _CPPCANVAS_TRANSPARENCYGROUPACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TRANSPARENCYGROUPACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TRANSPARENCYGROUPACTION_HXX
 
 #include <cppcanvas/canvas.hxx>
 #include <cppcanvas/renderer.hxx>
@@ -101,6 +101,6 @@ namespace cppcanvas
     }
 }
 
-#endif /*_CPPCANVAS_TRANSPARENCYGROUPACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TRANSPARENCYGROUPACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.hxx b/cppcanvas/source/uno/uno_mtfrenderer.hxx
index 64d8f4d1bbf9..821cf4fbcb51 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.hxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _UNO_MTF_RENDERER_HXX_
-#define _UNO_MTF_RENDERER_HXX_
+#ifndef INCLUDED_CPPCANVAS_SOURCE_UNO_UNO_MTFRENDERER_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_UNO_UNO_MTFRENDERER_HXX
 #include <com/sun/star/rendering/MtfRenderer.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index a446079f340d..e4b387ea51f6 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLBITMAP_HXX
-#define _CPPCANVAS_IMPLBITMAP_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XBitmap.hpp>
@@ -67,6 +67,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLBITMAP_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 5a96a3835df1..bae2541ce59f 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLBITMAPCANVAS_HXX
-#define _CPPCANVAS_IMPLBITMAPCANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX
 
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XBitmap.hpp>
@@ -59,6 +59,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLBITMAPCANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 63de9d4f87f1..8a6401f1c69a 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLCANVAS_HXX
-#define _CPPCANVAS_IMPLCANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/ViewState.hpp>
@@ -89,6 +89,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLCANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index 69ac454e8c3a..2d5e0310eb10 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLCOLOR_HXX
-#define _CPPCANVAS_IMPLCOLOR_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -51,6 +51,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLCOLOR_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index f3e5dff0e571..19187de4620e 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLCUSTOMSPRITE_HXX
-#define _CPPCANVAS_IMPLCUSTOMSPRITE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
 
 #include <sal/types.h>
 
@@ -58,6 +58,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLCUSTOMSPRITE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index c754ab1449e0..227e7da83f99 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLFONT_HXX
-#define _CPPCANVAS_IMPLFONT_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -64,6 +64,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLFONT_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index fdfc19d548b9..b685bdcf7706 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CANVAS_IMPLPOLYPOLYGON_HXX
-#define _CANVAS_IMPLPOLYPOLYGON_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
@@ -82,6 +82,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CANVAS_IMPLPOLYPOLYGON_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index 290fe9548831..8cb9d8fa9f39 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLSPRITE_HXX
-#define _CPPCANVAS_IMPLSPRITE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
@@ -73,6 +73,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLSPRITE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 60cd52e2563e..8a0223e1bee7 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLSPRITECANVAS_HXX
-#define _CPPCANVAS_IMPLSPRITECANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX
 
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <basegfx/vector/b2dsize.hxx>
@@ -89,6 +89,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLSPRITECANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */