fixincludeguards.sh: include/{basegfx,basic}

Change-Id: Id18d3f4b4ed763b2ec9e718d66c3c3b9968fcac2

97 files changed, 268 insertions, 268 deletions

diff --git a/include/basegfx/basegfxdllapi.h b/include/basegfx/basegfxdllapi.h
index b71f0755d277..d26c0029b859 100644
--- a/include/basegfx/basegfxdllapi.h
+++ b/include/basegfx/basegfxdllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFXDLLAPI_H
-#define INCLUDED_BASEGFXDLLAPI_H
+#ifndef INCLUDED_BASEGFX_BASEGFXDLLAPI_H
+#define INCLUDED_BASEGFX_BASEGFXDLLAPI_H
 
 #if defined BASEGFX_STATICLIBRARY
 
diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index 9b91e212ec89..152984af646d 100644
--- a/include/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_COLOR_BCOLOR_HXX
-#define _BGFX_COLOR_BCOLOR_HXX
+#ifndef INCLUDED_BASEGFX_COLOR_BCOLOR_HXX
+#define INCLUDED_BASEGFX_COLOR_BCOLOR_HXX
 
 #include <basegfx/tuple/b3dtuple.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -224,6 +224,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_COLOR_BCOLOR_HXX */
+#endif // INCLUDED_BASEGFX_COLOR_BCOLOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index 4b6f04efc8e9..b8fbd9a8e4d6 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_COLOR_BCOLORMODIFIER_HXX
-#define _BGFX_COLOR_BCOLORMODIFIER_HXX
+#ifndef INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX
+#define INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX
 
 #include <basegfx/color/bcolor.hxx>
 #include <vector>
@@ -132,6 +132,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif // _BGFX_COLOR_BCOLORMODIFIER_HXX
+#endif // INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/color/bcolortools.hxx b/include/basegfx/color/bcolortools.hxx
index 42ac7aafb3cc..2b033ade73f3 100644
--- a/include/basegfx/color/bcolortools.hxx
+++ b/include/basegfx/color/bcolortools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_COLOR_BCOLORTOOLS_HXX
-#define _BGFX_COLOR_BCOLORTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_COLOR_BCOLORTOOLS_HXX
+#define INCLUDED_BASEGFX_COLOR_BCOLORTOOLS_HXX
 
 #include <sal/types.h>
 #include <basegfx/basegfxdllapi.h>
@@ -47,6 +47,6 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif /* _BGFX_COLOR_BCOLORTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_COLOR_BCOLORTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/curve/b2dbeziertools.hxx b/include/basegfx/curve/b2dbeziertools.hxx
index f52f00a1912f..a20598c82b3b 100644
--- a/include/basegfx/curve/b2dbeziertools.hxx
+++ b/include/basegfx/curve/b2dbeziertools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_CURVE_B2DBEZIERTOOLS_HXX
-#define _BGFX_CURVE_B2DBEZIERTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_CURVE_B2DBEZIERTOOLS_HXX
+#define INCLUDED_BASEGFX_CURVE_B2DBEZIERTOOLS_HXX
 
 #include <sal/types.h>
 #include <vector>
@@ -52,6 +52,6 @@ namespace basegfx
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif /* _BGFX_CURVE_B2DBEZIERTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_CURVE_B2DBEZIERTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/curve/b2dcubicbezier.hxx b/include/basegfx/curve/b2dcubicbezier.hxx
index 003a1970bb0a..22c55b5ee10c 100644
--- a/include/basegfx/curve/b2dcubicbezier.hxx
+++ b/include/basegfx/curve/b2dcubicbezier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_CURVE_B2DCUBICBEZIER_HXX
-#define _BGFX_CURVE_B2DCUBICBEZIER_HXX
+#ifndef INCLUDED_BASEGFX_CURVE_B2DCUBICBEZIER_HXX
+#define INCLUDED_BASEGFX_CURVE_B2DCUBICBEZIER_HXX
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/range/b2drange.hxx>
@@ -195,6 +195,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_CURVE_B2DCUBICBEZIER_HXX */
+#endif // INCLUDED_BASEGFX_CURVE_B2DCUBICBEZIER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/matrix/b2dhommatrix.hxx b/include/basegfx/matrix/b2dhommatrix.hxx
index 30204b91fad5..68c119c929c6 100644
--- a/include/basegfx/matrix/b2dhommatrix.hxx
+++ b/include/basegfx/matrix/b2dhommatrix.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
-#define _BGFX_MATRIX_B2DHOMMATRIX_HXX
+#ifndef INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIX_HXX
+#define INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIX_HXX
 
 #include <sal/types.h>
 #include <o3tl/cow_wrapper.hxx>
@@ -134,6 +134,6 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif /* _BGFX_MATRIX_B2DHOMMATRIX_HXX */
+#endif // INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/matrix/b2dhommatrixtools.hxx b/include/basegfx/matrix/b2dhommatrixtools.hxx
index 3f95beb72207..bbbabea4eed0 100644
--- a/include/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b2dhommatrixtools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX
-#define _BGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX
+#define INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX
 
 #include <sal/types.h>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -226,6 +226,6 @@ namespace basegfx
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif /* _BGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/matrix/b3dhommatrix.hxx b/include/basegfx/matrix/b3dhommatrix.hxx
index 037d400d674f..ad7c47d2e349 100644
--- a/include/basegfx/matrix/b3dhommatrix.hxx
+++ b/include/basegfx/matrix/b3dhommatrix.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_MATRIX_B3DHOMMATRIX_HXX
-#define _BGFX_MATRIX_B3DHOMMATRIX_HXX
+#ifndef INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIX_HXX
+#define INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIX_HXX
 
 #include <sal/types.h>
 #include <basegfx/point/b3dpoint.hxx>
@@ -150,6 +150,6 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif /* _BGFX_MATRIX_B3DHOMMATRIX_HXX */
+#endif // INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx
index 75e24b0d8574..140731eee8dd 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_NUMERIC_FTOOLS_HXX
-#define _BGFX_NUMERIC_FTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_NUMERIC_FTOOLS_HXX
+#define INCLUDED_BASEGFX_NUMERIC_FTOOLS_HXX
 
 #include <rtl/math.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -223,6 +223,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_NUMERIC_FTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_NUMERIC_FTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index 516a421579a6..86f9ea7f7817 100644
--- a/include/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_PIXEL_BPIXEL_HXX
-#define _BGFX_PIXEL_BPIXEL_HXX
+#ifndef INCLUDED_BASEGFX_PIXEL_BPIXEL_HXX
+#define INCLUDED_BASEGFX_PIXEL_BPIXEL_HXX
 
 #include <sal/types.h>
 #include <basegfx/numeric/ftools.hxx>
@@ -194,6 +194,6 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif /* _BGFX_PIXEL_BPIXEL_HXX */
+#endif // INCLUDED_BASEGFX_PIXEL_BPIXEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/point/b2dpoint.hxx b/include/basegfx/point/b2dpoint.hxx
index c5b87d95e40b..cee2170503e9 100644
--- a/include/basegfx/point/b2dpoint.hxx
+++ b/include/basegfx/point/b2dpoint.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POINT_B2DPOINT_HXX
-#define _BGFX_POINT_B2DPOINT_HXX
+#ifndef INCLUDED_BASEGFX_POINT_B2DPOINT_HXX
+#define INCLUDED_BASEGFX_POINT_B2DPOINT_HXX
 
 #include <ostream>
 
@@ -145,6 +145,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
     return stream << "(" << point.getX() << "," << point.getY() << ")";
 }
 
-#endif /* _BGFX_POINT_B2DPOINT_HXX */
+#endif // INCLUDED_BASEGFX_POINT_B2DPOINT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/point/b2ipoint.hxx b/include/basegfx/point/b2ipoint.hxx
index 33b225a2a36d..58c1ef7b3c8e 100644
--- a/include/basegfx/point/b2ipoint.hxx
+++ b/include/basegfx/point/b2ipoint.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POINT_B2IPOINT_HXX
-#define _BGFX_POINT_B2IPOINT_HXX
+#ifndef INCLUDED_BASEGFX_POINT_B2IPOINT_HXX
+#define INCLUDED_BASEGFX_POINT_B2IPOINT_HXX
 
 #include <basegfx/tuple/b2ituple.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -112,6 +112,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_POINT_B2IPOINT_HXX */
+#endif // INCLUDED_BASEGFX_POINT_B2IPOINT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/point/b3dpoint.hxx b/include/basegfx/point/b3dpoint.hxx
index 391bc128b9fb..e853b78a9428 100644
--- a/include/basegfx/point/b3dpoint.hxx
+++ b/include/basegfx/point/b3dpoint.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POINT_B3DPOINT_HXX
-#define _BGFX_POINT_B3DPOINT_HXX
+#ifndef INCLUDED_BASEGFX_POINT_B3DPOINT_HXX
+#define INCLUDED_BASEGFX_POINT_B3DPOINT_HXX
 
 #include <basegfx/tuple/b3dtuple.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -140,6 +140,6 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif /* _BGFX_POINT_B3DPOINT_HXX */
+#endif // INCLUDED_BASEGFX_POINT_B3DPOINT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/point/b3ipoint.hxx b/include/basegfx/point/b3ipoint.hxx
index e80514c13de2..08f1f09c2f56 100644
--- a/include/basegfx/point/b3ipoint.hxx
+++ b/include/basegfx/point/b3ipoint.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POINT_B3IPOINT_HXX
-#define _BGFX_POINT_B3IPOINT_HXX
+#ifndef INCLUDED_BASEGFX_POINT_B3IPOINT_HXX
+#define INCLUDED_BASEGFX_POINT_B3IPOINT_HXX
 
 #include <basegfx/tuple/b3ituple.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -124,6 +124,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_POINT_B3IPOINT_HXX */
+#endif // INCLUDED_BASEGFX_POINT_B3IPOINT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx
index 934158f88a2f..62a6e228d0d8 100644
--- a/include/basegfx/polygon/b2dlinegeometry.hxx
+++ b/include/basegfx/polygon/b2dlinegeometry.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B2DLINEGEOMETRY_HXX
-#define _BGFX_POLYGON_B2DLINEGEOMETRY_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DLINEGEOMETRY_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DLINEGEOMETRY_HXX
 
 #include <sal/types.h>
 #include <basegfx/numeric/ftools.hxx>
@@ -136,6 +136,6 @@ namespace basegfx
     } // end of namespace tools
 } // end of namespace basegfx
 
-#endif /* _BGFX_POLYGON_B2DLINEGEOMETRY_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DLINEGEOMETRY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygon.hxx b/include/basegfx/polygon/b2dpolygon.hxx
index 712de7787d2c..da88050c5238 100644
--- a/include/basegfx/polygon/b2dpolygon.hxx
+++ b/include/basegfx/polygon/b2dpolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B2DPOLYGON_HXX
-#define _BGFX_POLYGON_B2DPOLYGON_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGON_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DPOLYGON_HXX
 
 #include <ostream>
 
@@ -238,6 +238,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
     return stream;
 }
 
-#endif /* _BGFX_POLYGON_B2DPOLYGON_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygonclipper.hxx b/include/basegfx/polygon/b2dpolygonclipper.hxx
index 197958e45a00..a79b6eec4d3f 100644
--- a/include/basegfx/polygon/b2dpolygonclipper.hxx
+++ b/include/basegfx/polygon/b2dpolygonclipper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYPOLYGON_B2DPOLYGONCLIPPER_HXX
-#define _BGFX_POLYPOLYGON_B2DPOLYGONCLIPPER_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCLIPPER_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCLIPPER_HXX
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -65,6 +65,6 @@ namespace basegfx
     } // end of namespace tools
 } // end of namespace basegfx
 
-#endif /* _BGFX_POLYPOLYGON_B2DPOLYGONCLIPPER_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCLIPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
index 05f8e0e0cb3a..6450a9ba1905 100644
--- a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
+++ b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_CUTANDTOUCH_HXX
-#define _BGFX_POLYGON_CUTANDTOUCH_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCUTANDTOUCH_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCUTANDTOUCH_HXX
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -53,6 +53,6 @@ namespace basegfx
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif /* _BGFX_POLYGON_CUTANDTOUCH_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCUTANDTOUCH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx
index af5559eff6a7..d00ed1ea8460 100644
--- a/include/basegfx/polygon/b2dpolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolygontools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX
-#define _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTOOLS_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTOOLS_HXX
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
@@ -450,6 +450,6 @@ namespace basegfx
     } // end of namespace tools
 } // end of namespace basegfx
 
-#endif /* _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolygontriangulator.hxx b/include/basegfx/polygon/b2dpolygontriangulator.hxx
index 5af34ae1ecd2..48457fcadc74 100644
--- a/include/basegfx/polygon/b2dpolygontriangulator.hxx
+++ b/include/basegfx/polygon/b2dpolygontriangulator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
-#define _BGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -38,6 +38,6 @@ namespace basegfx
     } // end of namespace triangulator
 } // end of namespace basegfx
 
-#endif /* _BGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolypolygon.hxx b/include/basegfx/polygon/b2dpolypolygon.hxx
index efe58337a886..203db76663a8 100644
--- a/include/basegfx/polygon/b2dpolypolygon.hxx
+++ b/include/basegfx/polygon/b2dpolypolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B2DPOLYPOLYGON_HXX
-#define _BGFX_POLYGON_B2DPOLYPOLYGON_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGON_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGON_HXX
 
 #include <ostream>
 #include <vector>
@@ -148,6 +148,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
     return stream;
 }
 
-#endif /* _BGFX_POLYGON_B2DPOLYPOLYGON_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolypolygoncutter.hxx b/include/basegfx/polygon/b2dpolypolygoncutter.hxx
index 31bd8b6279f9..0b42f6ff4dfd 100644
--- a/include/basegfx/polygon/b2dpolypolygoncutter.hxx
+++ b/include/basegfx/polygon/b2dpolypolygoncutter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX
-#define _BGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -148,6 +148,6 @@ namespace basegfx
 //////////////////////////////////////////////////////////////////////////////
 
 
-#endif /* _BGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolypolygonfillrule.hxx b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx
index 390dd9bac9f0..e3b4be39c8d4 100644
--- a/include/basegfx/polygon/b2dpolypolygonfillrule.hxx
+++ b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX
-#define _BGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX
 
 #include <sal/types.h>
 
@@ -49,6 +49,6 @@ namespace basegfx
     };
 }
 
-#endif /* _BGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx
index 59f03ff3a63d..521d07595f8a 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYPOLYGON_B2DPOLYGONTOOLS_HXX
-#define _BGFX_POLYPOLYGON_B2DPOLYGONTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONTOOLS_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONTOOLS_HXX
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
@@ -262,6 +262,6 @@ namespace basegfx
     } // end of namespace tools
 } // end of namespace basegfx
 
-#endif /* _BGFX_POLYPOLYGON_B2DPOLYGONTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx
index 43ee9fb37f6c..1aff47467af9 100644
--- a/include/basegfx/polygon/b2dtrapezoid.hxx
+++ b/include/basegfx/polygon/b2dtrapezoid.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B2DTRAPEZOID_HXX
-#define _BGFX_POLYGON_B2DTRAPEZOID_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX
+#define INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -119,6 +119,6 @@ namespace basegfx
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif /* _BGFX_POLYGON_B2DTRAPEZOID_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx
index 7199eea9684c..ccc7ffb514bb 100644
--- a/include/basegfx/polygon/b3dpolygon.hxx
+++ b/include/basegfx/polygon/b3dpolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B3DPOLYGON_HXX
-#define _BGFX_POLYGON_B3DPOLYGON_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B3DPOLYGON_HXX
+#define INCLUDED_BASEGFX_POLYGON_B3DPOLYGON_HXX
 
 #include <sal/types.h>
 #include <o3tl/cow_wrapper.hxx>
@@ -125,6 +125,6 @@ namespace basegfx
 //////////////////////////////////////////////////////////////////////////////
 
 
-#endif /* _BGFX_POLYGON_B3DPOLYGON_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b3dpolygontools.hxx b/include/basegfx/polygon/b3dpolygontools.hxx
index 9ed32b42fb90..45695d4fded7 100644
--- a/include/basegfx/polygon/b3dpolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolygontools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B3DPOLYGONTOOLS_HXX
-#define _BGFX_POLYGON_B3DPOLYGONTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B3DPOLYGONTOOLS_HXX
+#define INCLUDED_BASEGFX_POLYGON_B3DPOLYGONTOOLS_HXX
 
 #include <basegfx/point/b3dpoint.hxx>
 #include <basegfx/vector/b3dvector.hxx>
@@ -130,6 +130,6 @@ namespace basegfx
     } // end of namespace tools
 } // end of namespace basegfx
 
-#endif /* _BGFX_POLYGON_B3DPOLYGONTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYGONTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b3dpolypolygon.hxx b/include/basegfx/polygon/b3dpolypolygon.hxx
index d67da6ad690b..a720ef4b762c 100644
--- a/include/basegfx/polygon/b3dpolypolygon.hxx
+++ b/include/basegfx/polygon/b3dpolypolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYGON_B3DPOLYPOLYGON_HXX
-#define _BGFX_POLYGON_B3DPOLYPOLYGON_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGON_HXX
+#define INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGON_HXX
 
 #include <sal/types.h>
 #include <o3tl/cow_wrapper.hxx>
@@ -112,6 +112,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_POLYGON_B3DPOLYPOLYGON_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx
index a50167f9b4de..3b5011ddeeb3 100644
--- a/include/basegfx/polygon/b3dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolypolygontools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_POLYPOLYGON_B3DPOLYGONTOOLS_HXX
-#define _BGFX_POLYPOLYGON_B3DPOLYGONTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGONTOOLS_HXX
+#define INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGONTOOLS_HXX
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
@@ -128,6 +128,6 @@ namespace basegfx
     } // end of namespace tools
 } // end of namespace basegfx
 
-#endif /* _BGFX_POLYPOLYGON_B3DPOLYGONTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGONTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b1drange.hxx b/include/basegfx/range/b1drange.hxx
index ffe704a1b845..ec3751a7ec1f 100644
--- a/include/basegfx/range/b1drange.hxx
+++ b/include/basegfx/range/b1drange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B1DRANGE_HXX
-#define _BGFX_RANGE_B1DRANGE_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B1DRANGE_HXX
+#define INCLUDED_BASEGFX_RANGE_B1DRANGE_HXX
 
 #include <basegfx/range/basicrange.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -169,6 +169,6 @@ namespace basegfx
 } // end of namespace basegfx
 
 
-#endif /* _BGFX_RANGE_B1DRANGE_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B1DRANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b1ibox.hxx b/include/basegfx/range/b1ibox.hxx
index 7c81e37c1288..d7ee4e317d89 100644
--- a/include/basegfx/range/b1ibox.hxx
+++ b/include/basegfx/range/b1ibox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B1IBOX_HXX
-#define _BGFX_RANGE_B1IBOX_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B1IBOX_HXX
+#define INCLUDED_BASEGFX_RANGE_B1IBOX_HXX
 
 #include <basegfx/range/basicbox.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -159,6 +159,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_RANGE_B1IBOX_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B1IBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b1irange.hxx b/include/basegfx/range/b1irange.hxx
index 0ba5878fb0c8..1db22484ab34 100644
--- a/include/basegfx/range/b1irange.hxx
+++ b/include/basegfx/range/b1irange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B1IRANGE_HXX
-#define _BGFX_RANGE_B1IRANGE_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B1IRANGE_HXX
+#define INCLUDED_BASEGFX_RANGE_B1IRANGE_HXX
 
 #include <basegfx/range/basicrange.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -164,6 +164,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_RANGE_B1IRANGE_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B1IRANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2dconnectedranges.hxx b/include/basegfx/range/b2dconnectedranges.hxx
index f1d65196bd8f..dfd99064d6ef 100644
--- a/include/basegfx/range/b2dconnectedranges.hxx
+++ b/include/basegfx/range/b2dconnectedranges.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B2DCONNECTEDRANGES_HXX
-#define _BGFX_RANGE_B2DCONNECTEDRANGES_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B2DCONNECTEDRANGES_HXX
+#define INCLUDED_BASEGFX_RANGE_B2DCONNECTEDRANGES_HXX
 
 #include <osl/diagnose.h>
 #include <basegfx/range/b2drange.hxx>
@@ -252,6 +252,6 @@ namespace basegfx
     };
 }
 
-#endif /* _BGFX_RANGE_B2DCONNECTEDRANGES_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B2DCONNECTEDRANGES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2dpolyrange.hxx b/include/basegfx/range/b2dpolyrange.hxx
index b910062d11a3..f33b35464c48 100644
--- a/include/basegfx/range/b2dpolyrange.hxx
+++ b/include/basegfx/range/b2dpolyrange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B2DPOLYRANGE_HXX
-#define _BGFX_RANGE_B2DPOLYRANGE_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B2DPOLYRANGE_HXX
+#define INCLUDED_BASEGFX_RANGE_B2DPOLYRANGE_HXX
 
 #include <o3tl/cow_wrapper.hxx>
 #include <boost/tuple/tuple.hpp>
@@ -89,6 +89,6 @@ namespace basegfx
     };
 }
 
-#endif /* _BGFX_RANGE_B2DPOLYRANGE_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B2DPOLYRANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2drange.hxx b/include/basegfx/range/b2drange.hxx
index 52277e42465e..07690017fa86 100644
--- a/include/basegfx/range/b2drange.hxx
+++ b/include/basegfx/range/b2drange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B2DRANGE_HXX
-#define _BGFX_RANGE_B2DRANGE_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B2DRANGE_HXX
+#define INCLUDED_BASEGFX_RANGE_B2DRANGE_HXX
 
 #include <ostream>
 #include <vector>
@@ -323,6 +323,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
     return stream << range.getWidth() << "x" << range.getHeight() << "@" << range.getMinimum();
 }
 
-#endif /* _BGFX_RANGE_B2DRANGE_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B2DRANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2drangeclipper.hxx b/include/basegfx/range/b2drangeclipper.hxx
index 99bc8763369d..a196b210e6f1 100644
--- a/include/basegfx/range/b2drangeclipper.hxx
+++ b/include/basegfx/range/b2drangeclipper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B2DRANGECLIPPER_HXX
-#define _BGFX_RANGE_B2DRANGECLIPPER_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B2DRANGECLIPPER_HXX
+#define INCLUDED_BASEGFX_RANGE_B2DRANGECLIPPER_HXX
 
 #include <basegfx/range/b2dpolyrange.hxx>
 #include <vector>
@@ -40,6 +40,6 @@ namespace basegfx
     }
 }
 
-#endif /* _BGFX_RANGE_B2DRANGECLIPPER_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B2DRANGECLIPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2drectangle.hxx b/include/basegfx/range/b2drectangle.hxx
index 8d4715d64410..603660206cf4 100644
--- a/include/basegfx/range/b2drectangle.hxx
+++ b/include/basegfx/range/b2drectangle.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B2DRECTANGLE_HXX
-#define _BGFX_RANGE_B2DRECTANGLE_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B2DRECTANGLE_HXX
+#define INCLUDED_BASEGFX_RANGE_B2DRECTANGLE_HXX
 
 #include <basegfx/range/b2drange.hxx>
 
@@ -31,6 +31,6 @@ namespace basegfx
     typedef B2DRange B2DRectangle;
 }
 
-#endif /* _BGFX_RANGE_B2DRECTANGLE_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B2DRECTANGLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2ibox.hxx b/include/basegfx/range/b2ibox.hxx
index 20bf7c11a07c..09ae867c85b0 100644
--- a/include/basegfx/range/b2ibox.hxx
+++ b/include/basegfx/range/b2ibox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B2IBOX_HXX
-#define _BGFX_RANGE_B2IBOX_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B2IBOX_HXX
+#define INCLUDED_BASEGFX_RANGE_B2IBOX_HXX
 
 #include <ostream>
 #include <vector>
@@ -268,6 +268,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
                       << "@(" << box.getMinX() << "," << box.getMinY() << ")";
 }
 
-#endif /* _BGFX_RANGE_B2IBOX_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B2IBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2irange.hxx b/include/basegfx/range/b2irange.hxx
index 6befb1efd2f4..65756dfb7600 100644
--- a/include/basegfx/range/b2irange.hxx
+++ b/include/basegfx/range/b2irange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B2IRANGE_HXX
-#define _BGFX_RANGE_B2IRANGE_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B2IRANGE_HXX
+#define INCLUDED_BASEGFX_RANGE_B2IRANGE_HXX
 
 #include <ostream>
 #include <vector>
@@ -294,6 +294,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
                       << "@(" << range.getMinX() << "," << range.getMinY() << ")";
 }
 
-#endif /* _BGFX_RANGE_B2IRANGE_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B2IRANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b2irectangle.hxx b/include/basegfx/range/b2irectangle.hxx
index 40792732ab1d..022a1c0fe730 100644
--- a/include/basegfx/range/b2irectangle.hxx
+++ b/include/basegfx/range/b2irectangle.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B2IRECTANGLE_HXX
-#define _BGFX_RANGE_B2IRECTANGLE_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B2IRECTANGLE_HXX
+#define INCLUDED_BASEGFX_RANGE_B2IRECTANGLE_HXX
 
 #include <basegfx/range/b2irange.hxx>
 
@@ -31,6 +31,6 @@ namespace basegfx
     typedef B2IRange B2IRectangle;
 }
 
-#endif /* _BGFX_RANGE_B2IRECTANGLE_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B2IRECTANGLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b3drange.hxx b/include/basegfx/range/b3drange.hxx
index 7b17f04e4964..ea0b2e82a7db 100644
--- a/include/basegfx/range/b3drange.hxx
+++ b/include/basegfx/range/b3drange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B3DRANGE_HXX
-#define _BGFX_RANGE_B3DRANGE_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B3DRANGE_HXX
+#define INCLUDED_BASEGFX_RANGE_B3DRANGE_HXX
 
 #include <basegfx/vector/b3dvector.hxx>
 #include <basegfx/point/b3dpoint.hxx>
@@ -268,6 +268,6 @@ namespace basegfx
 } // end of namespace basegfx
 
 
-#endif /* _BGFX_RANGE_B3DRANGE_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B3DRANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b3irange.hxx b/include/basegfx/range/b3irange.hxx
index 558c2abb4d62..4d3f0c7296a7 100644
--- a/include/basegfx/range/b3irange.hxx
+++ b/include/basegfx/range/b3irange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_B3IRANGE_HXX
-#define _BGFX_RANGE_B3IRANGE_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_B3IRANGE_HXX
+#define INCLUDED_BASEGFX_RANGE_B3IRANGE_HXX
 
 #include <basegfx/point/b3ipoint.hxx>
 #include <basegfx/point/b3dpoint.hxx>
@@ -235,6 +235,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_RANGE_B3IRANGE_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_B3IRANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/basicbox.hxx b/include/basegfx/range/basicbox.hxx
index bab84c17f89a..28667d34b9f7 100644
--- a/include/basegfx/range/basicbox.hxx
+++ b/include/basegfx/range/basicbox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_BASICBOX_HXX
-#define _BGFX_RANGE_BASICBOX_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_BASICBOX_HXX
+#define INCLUDED_BASEGFX_RANGE_BASICBOX_HXX
 
 #include <basegfx/range/basicrange.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -122,6 +122,6 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif /* _BGFX_RANGE_BASICBOX_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_BASICBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/basicrange.hxx b/include/basegfx/range/basicrange.hxx
index 51b5593ae61d..87fb5bac64d0 100644
--- a/include/basegfx/range/basicrange.hxx
+++ b/include/basegfx/range/basicrange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RANGE_BASICRANGE_HXX
-#define _BGFX_RANGE_BASICRANGE_HXX
+#ifndef INCLUDED_BASEGFX_RANGE_BASICRANGE_HXX
+#define INCLUDED_BASEGFX_RANGE_BASICRANGE_HXX
 
 #include <sal/types.h>
 #include <float.h>
@@ -273,6 +273,6 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif /* _BGFX_RANGE_BASICRANGE_HXX */
+#endif // INCLUDED_BASEGFX_RANGE_BASICRANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/raster/bpixelraster.hxx b/include/basegfx/raster/bpixelraster.hxx
index ed7ac931d805..19a898e31930 100644
--- a/include/basegfx/raster/bpixelraster.hxx
+++ b/include/basegfx/raster/bpixelraster.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RASTER_BPIXELRASTER_HXX
-#define _BGFX_RASTER_BPIXELRASTER_HXX
+#ifndef INCLUDED_BASEGFX_RASTER_BPIXELRASTER_HXX
+#define INCLUDED_BASEGFX_RASTER_BPIXELRASTER_HXX
 
 #include <algorithm>
 #include <string.h>
@@ -94,6 +94,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_RASTER_BPIXELRASTER_HXX */
+#endif // INCLUDED_BASEGFX_RASTER_BPIXELRASTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/raster/bzpixelraster.hxx b/include/basegfx/raster/bzpixelraster.hxx
index ddd4f1e56cb0..6cca5aebd6ac 100644
--- a/include/basegfx/raster/bzpixelraster.hxx
+++ b/include/basegfx/raster/bzpixelraster.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RASTER_BZPIXELRASTER_HXX
-#define _BGFX_RASTER_BZPIXELRASTER_HXX
+#ifndef INCLUDED_BASEGFX_RASTER_BZPIXELRASTER_HXX
+#define INCLUDED_BASEGFX_RASTER_BZPIXELRASTER_HXX
 
 #include <basegfx/raster/bpixelraster.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -85,6 +85,6 @@ namespace basegfx
     };
 } // end of namespace basegfx
 
-#endif /* _BGFX_RASTER_BZPIXELRASTER_HXX */
+#endif // INCLUDED_BASEGFX_RASTER_BZPIXELRASTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx
index 8ffa6f55da9a..ef44790a5323 100644
--- a/include/basegfx/raster/rasterconvert3d.hxx
+++ b/include/basegfx/raster/rasterconvert3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_RASTER_RASTERCONVERT3D_HXX
-#define _BGFX_RASTER_RASTERCONVERT3D_HXX
+#ifndef INCLUDED_BASEGFX_RASTER_RASTERCONVERT3D_HXX
+#define INCLUDED_BASEGFX_RASTER_RASTERCONVERT3D_HXX
 
 #include <sal/types.h>
 #include <vector>
@@ -445,6 +445,6 @@ namespace basegfx
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif /* _BGFX_RASTER_RASTERCONVERT3D_HXX */
+#endif // INCLUDED_BASEGFX_RASTER_RASTERCONVERT3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tools/b2dclipstate.hxx b/include/basegfx/tools/b2dclipstate.hxx
index f1d750ae636b..f963e8849b57 100644
--- a/include/basegfx/tools/b2dclipstate.hxx
+++ b/include/basegfx/tools/b2dclipstate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TOOLS_CLIPSTATE_HXX
-#define _BGFX_TOOLS_CLIPSTATE_HXX
+#ifndef INCLUDED_BASEGFX_TOOLS_B2DCLIPSTATE_HXX
+#define INCLUDED_BASEGFX_TOOLS_B2DCLIPSTATE_HXX
 
 #include <sal/types.h>
 #include <o3tl/cow_wrapper.hxx>
@@ -89,6 +89,6 @@ namespace basegfx
     }
 }
 
-#endif // _BGFX_TOOLS_CLIPSTATE_HXX
+#endif // INCLUDED_BASEGFX_TOOLS_B2DCLIPSTATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tools/canvastools.hxx b/include/basegfx/tools/canvastools.hxx
index 819a62e47b28..ba7f644ef00b 100644
--- a/include/basegfx/tools/canvastools.hxx
+++ b/include/basegfx/tools/canvastools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TOOLS_CANVASTOOLS_HXX
-#define _BGFX_TOOLS_CANVASTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_TOOLS_CANVASTOOLS_HXX
+#define INCLUDED_BASEGFX_TOOLS_CANVASTOOLS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -200,6 +200,6 @@ namespace basegfx
     }
 }
 
-#endif /* _BGFX_TOOLS_CANVASTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_TOOLS_CANVASTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tools/gradienttools.hxx b/include/basegfx/tools/gradienttools.hxx
index db4894e795c2..ab73551143a8 100644
--- a/include/basegfx/tools/gradienttools.hxx
+++ b/include/basegfx/tools/gradienttools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TOOLS_GRADIENTTOOLS_HXX
-#define _BGFX_TOOLS_GRADIENTTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_TOOLS_GRADIENTTOOLS_HXX
+#define INCLUDED_BASEGFX_TOOLS_GRADIENTTOOLS_HXX
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/range/b2drange.hxx>
diff --git a/include/basegfx/tools/keystoplerp.hxx b/include/basegfx/tools/keystoplerp.hxx
index 8d6d41af63d9..bef358784b4d 100644
--- a/include/basegfx/tools/keystoplerp.hxx
+++ b/include/basegfx/tools/keystoplerp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TOOLS_KEYSTOPLERP_HXX
-#define _BGFX_TOOLS_KEYSTOPLERP_HXX
+#ifndef INCLUDED_BASEGFX_TOOLS_KEYSTOPLERP_HXX
+#define INCLUDED_BASEGFX_TOOLS_KEYSTOPLERP_HXX
 
 #include <basegfx/numeric/ftools.hxx>
 #include <vector>
diff --git a/include/basegfx/tools/lerp.hxx b/include/basegfx/tools/lerp.hxx
index a0c0d714a295..6bb292569223 100644
--- a/include/basegfx/tools/lerp.hxx
+++ b/include/basegfx/tools/lerp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TOOLS_LERP_HXX
-#define _BGFX_TOOLS_LERP_HXX
+#ifndef INCLUDED_BASEGFX_TOOLS_LERP_HXX
+#define INCLUDED_BASEGFX_TOOLS_LERP_HXX
 
 #include <sal/types.h>
 
@@ -46,6 +46,6 @@ namespace basegfx
     }
 }
 
-#endif /* _BGFX_TOOLS_LERP_HXX */
+#endif // INCLUDED_BASEGFX_TOOLS_LERP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tools/rectcliptools.hxx b/include/basegfx/tools/rectcliptools.hxx
index 3d5f77e18e0e..f69cffc5e14c 100644
--- a/include/basegfx/tools/rectcliptools.hxx
+++ b/include/basegfx/tools/rectcliptools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TOOLS_RECTCLIPTOOLS_HXX
-#define _BGFX_TOOLS_RECTCLIPTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_TOOLS_RECTCLIPTOOLS_HXX
+#define INCLUDED_BASEGFX_TOOLS_RECTCLIPTOOLS_HXX
 
 #include <sal/types.h>
 #include <basegfx/range/b2ibox.hxx>
@@ -91,6 +91,6 @@ namespace basegfx
     }
 }
 
-#endif // _BGFX_TOOLS_RECTCLIPTOOLS_HXX
+#endif // INCLUDED_BASEGFX_TOOLS_RECTCLIPTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tools/tools.hxx b/include/basegfx/tools/tools.hxx
index c9af12b73fcd..9aa52b01d9c2 100644
--- a/include/basegfx/tools/tools.hxx
+++ b/include/basegfx/tools/tools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TOOLS_TOOLS_HXX
-#define _BGFX_TOOLS_TOOLS_HXX
+#ifndef INCLUDED_BASEGFX_TOOLS_TOOLS_HXX
+#define INCLUDED_BASEGFX_TOOLS_TOOLS_HXX
 
 #include <sal/types.h>
 #include <basegfx/basegfxdllapi.h>
@@ -122,6 +122,6 @@ namespace basegfx
     }
 }
 
-#endif /* _BGFX_TOOLS_TOOLS_HXX */
+#endif // INCLUDED_BASEGFX_TOOLS_TOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx
index 72ed9418663a..fea4990a4f1f 100644
--- a/include/basegfx/tools/unopolypolygon.hxx
+++ b/include/basegfx/tools/unopolypolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASEGFX_UNOPOLYPOLYGON_HXX
-#define INCLUDED_BASEGFX_UNOPOLYPOLYGON_HXX
+#ifndef INCLUDED_BASEGFX_TOOLS_UNOPOLYPOLYGON_HXX
+#define INCLUDED_BASEGFX_TOOLS_UNOPOLYPOLYGON_HXX
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase3.hxx>
@@ -105,6 +105,6 @@ namespace unotools
 }
 }
 
-#endif /* INCLUDED_BASEGFX_UNOPOLYPOLYGON_HXX */
+#endif // INCLUDED_BASEGFX_TOOLS_UNOPOLYPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tools/unotools.hxx b/include/basegfx/tools/unotools.hxx
index c95eb5361f5c..cc10e3551b35 100644
--- a/include/basegfx/tools/unotools.hxx
+++ b/include/basegfx/tools/unotools.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_BASEGFX_UNOTOOLS_HXX
-#define INCLUDED_BASEGFX_UNOTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_TOOLS_UNOTOOLS_HXX
+#define INCLUDED_BASEGFX_TOOLS_UNOTOOLS_HXX
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase3.hxx>
@@ -35,6 +35,6 @@ namespace unotools
 }
 }
 
-#endif /* INCLUDED_BASEGFX_UNOTOOLS_HXX */
+#endif // INCLUDED_BASEGFX_TOOLS_UNOTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tools/zoomtools.hxx b/include/basegfx/tools/zoomtools.hxx
index bd5095bced75..1ebab9fb0c45 100644
--- a/include/basegfx/tools/zoomtools.hxx
+++ b/include/basegfx/tools/zoomtools.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _BGFX_TOOLS_ZOOMTOOLS_HXX
-#define _BGFX_TOOLS_ZOOMTOOLS_HXX
+#ifndef INCLUDED_BASEGFX_TOOLS_ZOOMTOOLS_HXX
+#define INCLUDED_BASEGFX_TOOLS_ZOOMTOOLS_HXX
 
 #include <sal/types.h>
 #include <basegfx/basegfxdllapi.h>
diff --git a/include/basegfx/tuple/b2dtuple.hxx b/include/basegfx/tuple/b2dtuple.hxx
index f21124b5ca43..773505306ac9 100644
--- a/include/basegfx/tuple/b2dtuple.hxx
+++ b/include/basegfx/tuple/b2dtuple.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TUPLE_B2DTUPLE_HXX
-#define _BGFX_TUPLE_B2DTUPLE_HXX
+#ifndef INCLUDED_BASEGFX_TUPLE_B2DTUPLE_HXX
+#define INCLUDED_BASEGFX_TUPLE_B2DTUPLE_HXX
 
 #include <sal/types.h>
 #include <basegfx/numeric/ftools.hxx>
@@ -358,6 +358,6 @@ namespace basegfx
     BASEGFX_DLLPUBLIC B2ITuple fround(const B2DTuple& rTup);
 } // end of namespace basegfx
 
-#endif /* _BGFX_TUPLE_B2DTUPLE_HXX */
+#endif // INCLUDED_BASEGFX_TUPLE_B2DTUPLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b2i64tuple.hxx b/include/basegfx/tuple/b2i64tuple.hxx
index 13ac79ba9aa0..a58013df9a8d 100644
--- a/include/basegfx/tuple/b2i64tuple.hxx
+++ b/include/basegfx/tuple/b2i64tuple.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TUPLE_B2I64TUPLE_HXX
-#define _BGFX_TUPLE_B2I64TUPLE_HXX
+#ifndef INCLUDED_BASEGFX_TUPLE_B2I64TUPLE_HXX
+#define INCLUDED_BASEGFX_TUPLE_B2I64TUPLE_HXX
 
 #include <sal/types.h>
 #include <basegfx/tuple/b2dtuple.hxx>
@@ -310,6 +310,6 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif /* _BGFX_TUPLE_B2I64TUPLE_HXX */
+#endif // INCLUDED_BASEGFX_TUPLE_B2I64TUPLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b2ituple.hxx b/include/basegfx/tuple/b2ituple.hxx
index 546cbbaab77f..ea4e4d2230e4 100644
--- a/include/basegfx/tuple/b2ituple.hxx
+++ b/include/basegfx/tuple/b2ituple.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TUPLE_B2ITUPLE_HXX
-#define _BGFX_TUPLE_B2ITUPLE_HXX
+#ifndef INCLUDED_BASEGFX_TUPLE_B2ITUPLE_HXX
+#define INCLUDED_BASEGFX_TUPLE_B2ITUPLE_HXX
 
 #include <sal/types.h>
 #include <basegfx/numeric/ftools.hxx>
@@ -257,6 +257,6 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif /* _BGFX_TUPLE_B2ITUPLE_HXX */
+#endif // INCLUDED_BASEGFX_TUPLE_B2ITUPLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx
index d974f86abe28..a2d3b44cfdef 100644
--- a/include/basegfx/tuple/b3dtuple.hxx
+++ b/include/basegfx/tuple/b3dtuple.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TUPLE_B3DTUPLE_HXX
-#define _BGFX_TUPLE_B3DTUPLE_HXX
+#ifndef INCLUDED_BASEGFX_TUPLE_B3DTUPLE_HXX
+#define INCLUDED_BASEGFX_TUPLE_B3DTUPLE_HXX
 
 #include <sal/types.h>
 #include <basegfx/numeric/ftools.hxx>
@@ -427,6 +427,6 @@ namespace basegfx
     BASEGFX_DLLPUBLIC B3ITuple fround(const B3DTuple& rTup);
 } // end of namespace basegfx
 
-#endif /* _BGFX_TUPLE_B3DTUPLE_HXX */
+#endif // INCLUDED_BASEGFX_TUPLE_B3DTUPLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b3i64tuple.hxx b/include/basegfx/tuple/b3i64tuple.hxx
index 9e3587677c92..16098f33f8d2 100644
--- a/include/basegfx/tuple/b3i64tuple.hxx
+++ b/include/basegfx/tuple/b3i64tuple.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TUPLE_B3I64TUPLE_HXX
-#define _BGFX_TUPLE_B3I64TUPLE_HXX
+#ifndef INCLUDED_BASEGFX_TUPLE_B3I64TUPLE_HXX
+#define INCLUDED_BASEGFX_TUPLE_B3I64TUPLE_HXX
 
 #include <sal/types.h>
 #include <basegfx/tuple/b3dtuple.hxx>
@@ -341,6 +341,6 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif /* _BGFX_TUPLE_B3I64TUPLE_HXX */
+#endif // INCLUDED_BASEGFX_TUPLE_B3I64TUPLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/tuple/b3ituple.hxx b/include/basegfx/tuple/b3ituple.hxx
index ad4d8d348dee..32a1c8fec94f 100644
--- a/include/basegfx/tuple/b3ituple.hxx
+++ b/include/basegfx/tuple/b3ituple.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_TUPLE_B3ITUPLE_HXX
-#define _BGFX_TUPLE_B3ITUPLE_HXX
+#ifndef INCLUDED_BASEGFX_TUPLE_B3ITUPLE_HXX
+#define INCLUDED_BASEGFX_TUPLE_B3ITUPLE_HXX
 
 #include <sal/types.h>
 #include <basegfx/tuple/b3dtuple.hxx>
@@ -340,6 +340,6 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif /* _BGFX_TUPLE_B3ITUPLE_HXX */
+#endif // INCLUDED_BASEGFX_TUPLE_B3ITUPLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2dsize.hxx b/include/basegfx/vector/b2dsize.hxx
index bde343b46685..95baf41fe2fb 100644
--- a/include/basegfx/vector/b2dsize.hxx
+++ b/include/basegfx/vector/b2dsize.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_VECTOR_B2DSIZE_HXX
-#define _BGFX_VECTOR_B2DSIZE_HXX
+#ifndef INCLUDED_BASEGFX_VECTOR_B2DSIZE_HXX
+#define INCLUDED_BASEGFX_VECTOR_B2DSIZE_HXX
 
 #include <basegfx/vector/b2dvector.hxx>
 
@@ -31,6 +31,6 @@ namespace basegfx
     typedef B2DVector B2DSize;
 }
 
-#endif /* _BGFX_VECTOR_B2DSIZE_HXX */
+#endif // INCLUDED_BASEGFX_VECTOR_B2DSIZE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx
index 99489eb7169c..d55fdf41126f 100644
--- a/include/basegfx/vector/b2dvector.hxx
+++ b/include/basegfx/vector/b2dvector.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_VECTOR_B2DVECTOR_HXX
-#define _BGFX_VECTOR_B2DVECTOR_HXX
+#ifndef INCLUDED_BASEGFX_VECTOR_B2DVECTOR_HXX
+#define INCLUDED_BASEGFX_VECTOR_B2DVECTOR_HXX
 
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/vector/b2ivector.hxx>
@@ -249,6 +249,6 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif /* _BGFX_VECTOR_B2DVECTOR_HXX */
+#endif // INCLUDED_BASEGFX_VECTOR_B2DVECTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2enums.hxx b/include/basegfx/vector/b2enums.hxx
index abbf4cfaf546..b41db31b43b3 100644
--- a/include/basegfx/vector/b2enums.hxx
+++ b/include/basegfx/vector/b2enums.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_VECTOR_B2ENUMS_HXX
-#define _BGFX_VECTOR_B2ENUMS_HXX
+#ifndef INCLUDED_BASEGFX_VECTOR_B2ENUMS_HXX
+#define INCLUDED_BASEGFX_VECTOR_B2ENUMS_HXX
 
 #include <sal/types.h>
 
@@ -65,6 +65,6 @@ namespace basegfx
 
 } // end of namespace basegfx
 
-#endif /* _BGFX_VECTOR_B2ENUMS_HXX */
+#endif // INCLUDED_BASEGFX_VECTOR_B2ENUMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2isize.hxx b/include/basegfx/vector/b2isize.hxx
index 4a2fe2228661..530bc28a6f88 100644
--- a/include/basegfx/vector/b2isize.hxx
+++ b/include/basegfx/vector/b2isize.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_VECTOR_B2ISIZE_HXX
-#define _BGFX_VECTOR_B2ISIZE_HXX
+#ifndef INCLUDED_BASEGFX_VECTOR_B2ISIZE_HXX
+#define INCLUDED_BASEGFX_VECTOR_B2ISIZE_HXX
 
 #include <basegfx/vector/b2ivector.hxx>
 
@@ -31,6 +31,6 @@ namespace basegfx
     typedef B2IVector B2ISize;
 }
 
-#endif /* _BGFX_VECTOR_B2ISIZE_HXX */
+#endif // INCLUDED_BASEGFX_VECTOR_B2ISIZE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b2ivector.hxx b/include/basegfx/vector/b2ivector.hxx
index 71f438d11062..23eb811becd1 100644
--- a/include/basegfx/vector/b2ivector.hxx
+++ b/include/basegfx/vector/b2ivector.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_VECTOR_B2IVECTOR_HXX
-#define _BGFX_VECTOR_B2IVECTOR_HXX
+#ifndef INCLUDED_BASEGFX_VECTOR_B2IVECTOR_HXX
+#define INCLUDED_BASEGFX_VECTOR_B2IVECTOR_HXX
 
 #include <ostream>
 
@@ -149,6 +149,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
     return stream << "(" << vector.getX() << "," << vector.getY() << ")";
 }
 
-#endif /* _BGFX_VECTOR_B2IVECTOR_HXX */
+#endif // INCLUDED_BASEGFX_VECTOR_B2IVECTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b3dvector.hxx b/include/basegfx/vector/b3dvector.hxx
index 99f23bc7b6d3..c5b907132508 100644
--- a/include/basegfx/vector/b3dvector.hxx
+++ b/include/basegfx/vector/b3dvector.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_VECTOR_B3DVECTOR_HXX
-#define _BGFX_VECTOR_B3DVECTOR_HXX
+#ifndef INCLUDED_BASEGFX_VECTOR_B3DVECTOR_HXX
+#define INCLUDED_BASEGFX_VECTOR_B3DVECTOR_HXX
 
 #include <basegfx/tuple/b3dtuple.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -317,6 +317,6 @@ namespace basegfx
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif /* _BGFX_VECTOR_B3DVECTOR_HXX */
+#endif // INCLUDED_BASEGFX_VECTOR_B3DVECTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b3ivector.hxx b/include/basegfx/vector/b3ivector.hxx
index 8248ade15cb0..d56768384b31 100644
--- a/include/basegfx/vector/b3ivector.hxx
+++ b/include/basegfx/vector/b3ivector.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BGFX_VECTOR_B3IVECTOR_HXX
-#define _BGFX_VECTOR_B3IVECTOR_HXX
+#ifndef INCLUDED_BASEGFX_VECTOR_B3IVECTOR_HXX
+#define INCLUDED_BASEGFX_VECTOR_B3IVECTOR_HXX
 
 #include <basegfx/tuple/b3ituple.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -244,6 +244,6 @@ namespace basegfx
     }
 } // end of namespace basegfx
 
-#endif /* _BGFX_VECTOR_B3DVECTOR_HXX */
+#endif // INCLUDED_BASEGFX_VECTOR_B3IVECTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/basicdllapi.h b/include/basic/basicdllapi.h
index 5c5c4647cd4c..ceee64bab211 100644
--- a/include/basic/basicdllapi.h
+++ b/include/basic/basicdllapi.h
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_BASICDLLAPI_H
-#define INCLUDED_BASICDLLAPI_H
+#ifndef INCLUDED_BASIC_BASICDLLAPI_H
+#define INCLUDED_BASIC_BASICDLLAPI_H
 
 #include "sal/types.h"
 
@@ -18,6 +18,6 @@
 #endif
 #define BASIC_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_BASICDLLAPI_H */
+#endif // INCLUDED_BASIC_BASICDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx
index 411aeadb8545..0895f8152df9 100644
--- a/include/basic/basicmanagerrepository.hxx
+++ b/include/basic/basicmanagerrepository.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASICMANAGERREPOSITORY_HXX
-#define BASICMANAGERREPOSITORY_HXX
+#ifndef INCLUDED_BASIC_BASICMANAGERREPOSITORY_HXX
+#define INCLUDED_BASIC_BASICMANAGERREPOSITORY_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
@@ -137,6 +137,6 @@ namespace basic
 } // namespace basic
 //........................................................................
 
-#endif // BASICMANAGERREPOSITORY_HXX
+#endif // INCLUDED_BASIC_BASICMANAGERREPOSITORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 12bca4779565..409688cb5abc 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _BASMGR_HXX
-#define _BASMGR_HXX
+#ifndef INCLUDED_BASIC_BASMGR_HXX
+#define INCLUDED_BASIC_BASMGR_HXX
 
 #include <svl/brdcst.hxx>
 #include <basic/sbstar.hxx>
@@ -233,6 +233,6 @@ private:
                                            const OUString& LinkTargetURL );
 };
 
-#endif  //_BASMGR_HXX
+#endif // INCLUDED_BASIC_BASMGR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/basrdll.hxx b/include/basic/basrdll.hxx
index 20edde65b9cd..b5b8cd7ded2f 100644
--- a/include/basic/basrdll.hxx
+++ b/include/basic/basrdll.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BASRDLL_HXX
-#define _BASRDLL_HXX
+#ifndef INCLUDED_BASIC_BASRDLL_HXX
+#define INCLUDED_BASIC_BASRDLL_HXX
 
 class ResMgr;
 
@@ -47,6 +47,6 @@ public:
 
 #define BASIC_DLL() (*(BasicDLL**)GetAppData( SHL_BASIC ) )
 
-#endif //_BASRDLL_HXX
+#endif // INCLUDED_BASIC_BASRDLL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx
index a4c578dc2da8..f33914a7e122 100644
--- a/include/basic/codecompletecache.hxx
+++ b/include/basic/codecompletecache.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CODECOMPLETECACHE_H
-#define CODECOMPLETECACHE_H
+#ifndef INCLUDED_BASIC_CODECOMPLETECACHE_HXX
+#define INCLUDED_BASIC_CODECOMPLETECACHE_HXX
 
 #include <basic/sbdef.hxx>
 #include <basic/sbxobj.hxx>
@@ -98,6 +98,6 @@ public:
     void Clear();
 };
 
-#endif // CODECOMPLETECACHE_H
+#endif // INCLUDED_BASIC_CODECOMPLETECACHE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/global.hxx b/include/basic/global.hxx
index 267a32df57f2..9d63c14afe7a 100644
--- a/include/basic/global.hxx
+++ b/include/basic/global.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef BASIC_SBGLOBAL_HXX
-#define BASIC_SBGLOBAL_HXX
+#ifndef INCLUDED_BASIC_GLOBAL_HXX
+#define INCLUDED_BASIC_GLOBAL_HXX
 
 namespace utl {
     class TransliterationWrapper;
diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx
index 05dd70b4b66d..66eded12018a 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BASIC_MODSIZEEXCEEDED_HXX
-#define _BASIC_MODSIZEEXCEEDED_HXX
+#ifndef INCLUDED_BASIC_MODSIZEEXCEEDED_HXX
+#define INCLUDED_BASIC_MODSIZEEXCEEDED_HXX
 
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx
index 2bc29cbb08c3..932d7e8fdad0 100644
--- a/include/basic/sbdef.hxx
+++ b/include/basic/sbdef.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_SBDEF_HXX
-#define _SB_SBDEF_HXX
+#ifndef INCLUDED_BASIC_SBDEF_HXX
+#define INCLUDED_BASIC_SBDEF_HXX
 
 #include <basic/sbxdef.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/basic/sberrors.hxx b/include/basic/sberrors.hxx
index d407d858c479..cee7f75d7795 100644
--- a/include/basic/sberrors.hxx
+++ b/include/basic/sberrors.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_SBERRORS_HXX
-#define _SB_SBERRORS_HXX
+#ifndef INCLUDED_BASIC_SBERRORS_HXX
+#define INCLUDED_BASIC_SBERRORS_HXX
 
 #include <basic/sbxdef.hxx>
 
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index 9d4afbc37a24..b8f0a17d23a3 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_SBMETH_HXX
-#define _SB_SBMETH_HXX
+#ifndef INCLUDED_BASIC_SBMETH_HXX
+#define INCLUDED_BASIC_SBMETH_HXX
 
 #include <tools/errcode.hxx>
 #include <basic/sbxmeth.hxx>
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index cdeeddf3267b..dc88fd788904 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_SBMOD_HXX
-#define _SB_SBMOD_HXX
+#ifndef INCLUDED_BASIC_SBMOD_HXX
+#define INCLUDED_BASIC_SBMOD_HXX
 
 #include <com/sun/star/script/XInvocation.hpp>
 #include <basic/sbdef.hxx>
diff --git a/include/basic/sbobjmod.hxx b/include/basic/sbobjmod.hxx
index 14ca48681688..ee0444d1528c 100644
--- a/include/basic/sbobjmod.hxx
+++ b/include/basic/sbobjmod.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_OBJMOD_HXX
-#define _SB_OBJMOD_HXX
+#ifndef INCLUDED_BASIC_SBOBJMOD_HXX
+#define INCLUDED_BASIC_SBOBJMOD_HXX
 
 #include <rtl/ref.hxx>
 #include <basic/sbmod.hxx>
diff --git a/include/basic/sbprop.hxx b/include/basic/sbprop.hxx
index 463fd5d41c73..456cf759f889 100644
--- a/include/basic/sbprop.hxx
+++ b/include/basic/sbprop.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_SBPROPERTY_HXX
-#define _SB_SBPROPERTY_HXX
+#ifndef INCLUDED_BASIC_SBPROP_HXX
+#define INCLUDED_BASIC_SBPROP_HXX
 
 #include <basic/sbxprop.hxx>
 #include <basic/sbdef.hxx>
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index c84b62494169..acfe99626e9f 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_SBSTAR_HXX
-#define _SB_SBSTAR_HXX
+#ifndef INCLUDED_BASIC_SBSTAR_HXX
+#define INCLUDED_BASIC_SBSTAR_HXX
 
 #include <basic/sbx.hxx>
 #include <basic/sbxobj.hxx>
diff --git a/include/basic/sbuno.hxx b/include/basic/sbuno.hxx
index 30148690d188..9feaf8ce30bb 100644
--- a/include/basic/sbuno.hxx
+++ b/include/basic/sbuno.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_SBUNO_HXX
-#define _SB_SBUNO_HXX
+#ifndef INCLUDED_BASIC_SBUNO_HXX
+#define INCLUDED_BASIC_SBUNO_HXX
 
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index d5fba159e510..7bfe55e783ef 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBXCLASS_HXX
-#define _SBXCLASS_HXX
+#ifndef INCLUDED_BASIC_SBX_HXX
+#define INCLUDED_BASIC_SBX_HXX
 
 #include "tools/ref.hxx"
 #include "svl/smplhint.hxx"
diff --git a/include/basic/sbxbase.hxx b/include/basic/sbxbase.hxx
index 16484ee929d8..d53d11a2dcec 100644
--- a/include/basic/sbxbase.hxx
+++ b/include/basic/sbxbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBXBASE_HXX
-#define _SBXBASE_HXX
+#ifndef INCLUDED_BASIC_SBXBASE_HXX
+#define INCLUDED_BASIC_SBXBASE_HXX
 
 #include <i18nlangtag/lang.h>
 #include <basic/sbxdef.hxx>
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index 4c71d1a5b977..de81e628381b 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBXCORE_HXX
-#define _SBXCORE_HXX
+#ifndef INCLUDED_BASIC_SBXCORE_HXX
+#define INCLUDED_BASIC_SBXCORE_HXX
 
 #include <tools/rtti.hxx>
 #include <tools/ref.hxx>
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 781a71b3b430..4c1630a1d2d6 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SBXDEF_HXX
-#define _SBXDEF_HXX
+#ifndef INCLUDED_BASIC_SBXDEF_HXX
+#define INCLUDED_BASIC_SBXDEF_HXX
 
 
 #ifndef __RSC
diff --git a/include/basic/sbxfac.hxx b/include/basic/sbxfac.hxx
index 33035cf45c9b..b0bdda7da678 100644
--- a/include/basic/sbxfac.hxx
+++ b/include/basic/sbxfac.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SBX_SBX_FACTORY_HXX
-#define __SBX_SBX_FACTORY_HXX
+#ifndef INCLUDED_BASIC_SBXFAC_HXX
+#define INCLUDED_BASIC_SBXFAC_HXX
 
 #include <basic/sbxdef.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/basic/sbxform.hxx b/include/basic/sbxform.hxx
index 589f3ec24fd0..7d1c60f0ea56 100644
--- a/include/basic/sbxform.hxx
+++ b/include/basic/sbxform.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBXFORM_HXX
-#define _SBXFORM_HXX
+#ifndef INCLUDED_BASIC_SBXFORM_HXX
+#define INCLUDED_BASIC_SBXFORM_HXX
 
 //====================================================================
 // Implementation class for Basic command: Format$( d,formatStr )
diff --git a/include/basic/sbxmeth.hxx b/include/basic/sbxmeth.hxx
index 227c00cbad88..d64d239a1081 100644
--- a/include/basic/sbxmeth.hxx
+++ b/include/basic/sbxmeth.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SBX_SBXMETHOD_HXX
-#define __SBX_SBXMETHOD_HXX
+#ifndef INCLUDED_BASIC_SBXMETH_HXX
+#define INCLUDED_BASIC_SBXMETH_HXX
 
 #include <basic/sbxvar.hxx>
 #include "basicdllapi.h"
diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx
index 2dc4aa735513..bf04c3ac54af 100644
--- a/include/basic/sbxobj.hxx
+++ b/include/basic/sbxobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBX_SBXOBJECT_HXX
-#define _SBX_SBXOBJECT_HXX
+#ifndef INCLUDED_BASIC_SBXOBJ_HXX
+#define INCLUDED_BASIC_SBXOBJ_HXX
 
 #include <svl/lstner.hxx>
 #include <basic/sbxvar.hxx>
@@ -91,6 +91,6 @@ public:
 SV_DECL_REF(SbxObject)
 SV_IMPL_REF(SbxObject)
 
-#endif /* _SBX_SBXOBJECT_HXX */
+#endif // INCLUDED_BASIC_SBXOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/sbxprop.hxx b/include/basic/sbxprop.hxx
index 89d774d4967f..9ea51c0dbda2 100644
--- a/include/basic/sbxprop.hxx
+++ b/include/basic/sbxprop.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SBX_SBXPROPERTY_HXX
-#define __SBX_SBXPROPERTY_HXX
+#ifndef INCLUDED_BASIC_SBXPROP_HXX
+#define INCLUDED_BASIC_SBXPROP_HXX
 
 #include <basic/sbxvar.hxx>
 #include "basicdllapi.h"
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index a81836f125f6..dcdb43c721ff 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SBXVAR_HXX
-#define SBXVAR_HXX
+#ifndef INCLUDED_BASIC_SBXVAR_HXX
+#define INCLUDED_BASIC_SBXVAR_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/bridge/oleautomation/Decimal.hpp>
@@ -351,6 +351,6 @@ public:
 
 SV_DECL_REF(SbxVariable)
 
-#endif  // SBXVAR_HXX
+#endif // INCLUDED_BASIC_SBXVAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/vbahelper.hxx b/include/basic/vbahelper.hxx
index c18b67b63cd1..416e0a996e63 100644
--- a/include/basic/vbahelper.hxx
+++ b/include/basic/vbahelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASIC_VBAHELPR_HXX
-#define BASIC_VBAHELPR_HXX
+#ifndef INCLUDED_BASIC_VBAHELPER_HXX
+#define INCLUDED_BASIC_VBAHELPER_HXX
 
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/frame/XModel.hpp>