9 files changed, 25 insertions, 25 deletions
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index 6783c36e262b..ec587ce6f699 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _SV_GENDATA_HXX
-#define _SV_GENDATA_HXX
+#ifndef INCLUDED_VCL_INC_GENERIC_GENDATA_HXX
+#define INCLUDED_VCL_INC_GENERIC_GENDATA_HXX
 
 #include <osl/socket.hxx>
 #include <saldatabasic.hxx>
diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx
index 9e603b933166..285a9dc2e70a 100644
--- a/vcl/inc/generic/gendisp.hxx
+++ b/vcl/inc/generic/gendisp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCL_GEN_DISP_HXX
-#define _VCL_GEN_DISP_HXX
+#ifndef INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
+#define INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
 
 #include <sal/types.h>
 #include <osl/mutex.h>
@@ -75,6 +75,6 @@ public:
 };
 
 
-#endif // _VCL_GEN_DISP_HXX
+#endif // INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index acbe1d49e2fb..59ac04f0d009 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_GENERIC_INST_H
-#define _SV_GENERIC_INST_H
+#ifndef INCLUDED_VCL_INC_GENERIC_GENINST_H
+#define INCLUDED_VCL_INC_GENERIC_GENINST_H
 
 #include <tools/solar.h>
 #include <osl/thread.hxx>
@@ -118,6 +118,6 @@ inline SalGenericInstance *GetGenericInstance()
     return static_cast<SalGenericInstance *>(GetSalData()->m_pInstance);
 }
 
-#endif // _SV_GENERIC_INST_H
+#endif // INCLUDED_VCL_INC_GENERIC_GENINST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h
index 698cc3e95dfc..00e061e029f8 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/generic/genprn.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_GENERIC_PRN_H
-#define _SV_GENERIC_PRN_H
+#ifndef INCLUDED_VCL_INC_GENERIC_GENPRN_H
+#define INCLUDED_VCL_INC_GENERIC_GENPRN_H
 
 #include "vcl/jobdata.hxx"
 #include "generic/printergfx.hxx"
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 636606e85b7a..74ccf65137ee 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCL_GENPSPGRAPHICS_H
-#define _VCL_GENPSPGRAPHICS_H
+#ifndef INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H
+#define INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H
 
 
 #include "vcl/fontmanager.hxx"
@@ -191,6 +191,6 @@ public:
     virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const;
 };
 
-#endif // _VCL_GENPSPGRAPHICS_H
+#endif // INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h
index 25d73a09743b..77ff2edfa8bf 100644
--- a/vcl/inc/generic/gensys.h
+++ b/vcl/inc/generic/gensys.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_GENSYS_H
-#define _SV_GENSYS_H
+#ifndef INCLUDED_VCL_INC_GENERIC_GENSYS_H
+#define INCLUDED_VCL_INC_GENERIC_GENSYS_H
 
 #include <salsys.hxx>
 #include <salframe.hxx>
@@ -50,6 +50,6 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
 #endif
 };
 
-#endif // _SV_GENSYS_H
+#endif // INCLUDED_VCL_INC_GENERIC_GENSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 7e1acaff7e3b..452cf4bf0f4e 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_GLYPHCACHE_HXX
-#define _SV_GLYPHCACHE_HXX
+#ifndef INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
+#define INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
 
 #include <vcl/dllapi.h>
 
@@ -368,6 +368,6 @@ public:
     int             mnYOffset;
 };
 
-#endif // _SV_GLYPHCACHE_HXX
+#endif // INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index 94848cbfe80b..48f759b867ba 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PSPRINT_PRINTERGFX_HXX_
-#define _PSPRINT_PRINTERGFX_HXX_
+#ifndef INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
+#define INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
 
 #include "vcl/helper.hxx"
 #include "sallayout.hxx"
@@ -412,6 +412,6 @@ public:
 } /* namespace psp */
 
 
-#endif /* _PSPRINT_PRINTERGFX_HXX_ */
+#endif // INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index b60cc098323b..5c521bb37675 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PSPRINT_PRINTERJOB_HXX_
-#define _PSPRINT_PRINTERJOB_HXX_
+#ifndef INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
+#define INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
 
 #include "vcl/jobdata.hxx"
 #include "osl/file.hxx"
@@ -132,6 +132,6 @@ public:
 
 }  /* namespace psp */
 
-#endif /* _PSPRINT_PRINTERJOB_HXX_ */
+#endif // INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */