fixincludeguards.sh: include - the rest

Change-Id: If1ee11da444a7f96f2d8668b277540da0bb4dbe9

31 files changed, 82 insertions, 82 deletions

diff --git a/include/rtl/alloc.h b/include/rtl/alloc.h
index ef48d01719ee..f8f269690e65 100644
--- a/include/rtl/alloc.h
+++ b/include/rtl/alloc.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_ALLOC_H_
-#define _RTL_ALLOC_H_
+#ifndef INCLUDED_RTL_ALLOC_H
+#define INCLUDED_RTL_ALLOC_H
 
 #include "sal/config.h"
 
@@ -252,6 +252,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_cache_free (
 }
 #endif
 
-#endif /*_RTL_ALLOC_H_ */
+#endif // INCLUDED_RTL_ALLOC_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/bootstrap.h b/include/rtl/bootstrap.h
index ccfdd0521e20..6a4e134cf8cf 100644
--- a/include/rtl/bootstrap.h
+++ b/include/rtl/bootstrap.h
@@ -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 _RTL_BOOTSTRAP_H_
-#define _RTL_BOOTSTRAP_H_
+#ifndef INCLUDED_RTL_BOOTSTRAP_H
+#define INCLUDED_RTL_BOOTSTRAP_H
 
 #include "sal/config.h"
 
diff --git a/include/rtl/bootstrap.hxx b/include/rtl/bootstrap.hxx
index 057e60625021..5ec010791029 100644
--- a/include/rtl/bootstrap.hxx
+++ b/include/rtl/bootstrap.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 _RTL_BOOTSTRAP_HXX_
-#define _RTL_BOOTSTRAP_HXX_
+#ifndef INCLUDED_RTL_BOOTSTRAP_HXX
+#define INCLUDED_RTL_BOOTSTRAP_HXX
 #include <rtl/ustring.hxx>
 #include <rtl/bootstrap.h>
 
diff --git a/include/rtl/byteseq.h b/include/rtl/byteseq.h
index 99107143b601..a27721cf547f 100644
--- a/include/rtl/byteseq.h
+++ b/include/rtl/byteseq.h
@@ -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 _RTL_BYTESEQ_H_
-#define _RTL_BYTESEQ_H_
+#ifndef INCLUDED_RTL_BYTESEQ_H
+#define INCLUDED_RTL_BYTESEQ_H
 
 #include "sal/config.h"
 
diff --git a/include/rtl/byteseq.hxx b/include/rtl/byteseq.hxx
index aaff08ed97a6..1d39ddefcf15 100644
--- a/include/rtl/byteseq.hxx
+++ b/include/rtl/byteseq.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 _RTL_BYTESEQ_HXX_
-#define _RTL_BYTESEQ_HXX_
+#ifndef INCLUDED_RTL_BYTESEQ_HXX
+#define INCLUDED_RTL_BYTESEQ_HXX
 
 #include <osl/interlck.h>
 #include <rtl/byteseq.h>
diff --git a/include/rtl/cipher.h b/include/rtl/cipher.h
index a116e57ba071..36861a3dbd04 100644
--- a/include/rtl/cipher.h
+++ b/include/rtl/cipher.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_CIPHER_H_
-#define _RTL_CIPHER_H_
+#ifndef INCLUDED_RTL_CIPHER_H
+#define INCLUDED_RTL_CIPHER_H
 
 #include "sal/config.h"
 
@@ -312,6 +312,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_cipher_destroyARCFOUR (
 }
 #endif
 
-#endif /* !_RTL_CIPHER_H_ */
+#endif /* ! INCLUDED_RTL_CIPHER_H */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/crc.h b/include/rtl/crc.h
index 7fad87ef4f37..d320c5381c55 100644
--- a/include/rtl/crc.h
+++ b/include/rtl/crc.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_CRC_H_
-#define _RTL_CRC_H_
+#ifndef INCLUDED_RTL_CRC_H
+#define INCLUDED_RTL_CRC_H
 
 #include "sal/config.h"
 
@@ -58,6 +58,6 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL rtl_crc32 (
 }
 #endif
 
-#endif /* _RTL_CRC_H_ */
+#endif // INCLUDED_RTL_CRC_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/digest.h b/include/rtl/digest.h
index cc49838821f7..403fbe8e8e78 100644
--- a/include/rtl/digest.h
+++ b/include/rtl/digest.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_DIGEST_H_
-#define _RTL_DIGEST_H_
+#ifndef INCLUDED_RTL_DIGEST_H
+#define INCLUDED_RTL_DIGEST_H
 
 #include "sal/config.h"
 
@@ -638,6 +638,6 @@ SAL_DLLPUBLIC rtlDigestError SAL_CALL rtl_digest_PBKDF2 (
 }
 #endif
 
-#endif /* _RTL_DIGEST_H_ */
+#endif // INCLUDED_RTL_DIGEST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/locale.h b/include/rtl/locale.h
index 197a9152284d..68e1531d689b 100644
--- a/include/rtl/locale.h
+++ b/include/rtl/locale.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_LOCALE_H_
-#define _RTL_LOCALE_H_
+#ifndef INCLUDED_RTL_LOCALE_H
+#define INCLUDED_RTL_LOCALE_H
 
 #include "sal/config.h"
 
@@ -130,7 +130,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_locale_equals( rtl_Locale * This, rtl_Local
 }
 #endif
 
-#endif /* _RTL_LOCALE_H_ */
+#endif // INCLUDED_RTL_LOCALE_H
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/logfile.h b/include/rtl/logfile.h
index c14c5c118abd..ccb8d2957af8 100644
--- a/include/rtl/logfile.h
+++ b/include/rtl/logfile.h
@@ -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 _RTL_LOGFILE_H_
-#define _RTL_LOGFILE_H_
+#ifndef INCLUDED_RTL_LOGFILE_H
+#define INCLUDED_RTL_LOGFILE_H
 
 #include "sal/config.h"
 
diff --git a/include/rtl/logfile.hxx b/include/rtl/logfile.hxx
index d911f5664f92..82ed1687425b 100644
--- a/include/rtl/logfile.hxx
+++ b/include/rtl/logfile.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 _RTL_LOGFILE_HXX_
-#define _RTL_LOGFILE_HXX_
+#ifndef INCLUDED_RTL_LOGFILE_HXX
+#define INCLUDED_RTL_LOGFILE_HXX
 
 #include <rtl/logfile.h>
 #include <rtl/string.hxx>
diff --git a/include/rtl/process.h b/include/rtl/process.h
index fa8fdda62e9d..d7ea575615cb 100644
--- a/include/rtl/process.h
+++ b/include/rtl/process.h
@@ -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 _RTL_PROCESS_H_
-#define _RTL_PROCESS_H_
+#ifndef INCLUDED_RTL_PROCESS_H
+#define INCLUDED_RTL_PROCESS_H
 
 #include "sal/config.h"
 
diff --git a/include/rtl/random.h b/include/rtl/random.h
index 80c9c15a2c52..6471418b5f3c 100644
--- a/include/rtl/random.h
+++ b/include/rtl/random.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_RANDOM_H_
-#define _RTL_RANDOM_H_
+#ifndef INCLUDED_RTL_RANDOM_H
+#define INCLUDED_RTL_RANDOM_H
 
 #include "sal/config.h"
 
@@ -105,6 +105,6 @@ SAL_DLLPUBLIC rtlRandomError SAL_CALL rtl_random_getBytes (
 }
 #endif
 
-#endif /* _RTL_RANDOM_H_ */
+#endif // INCLUDED_RTL_RANDOM_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx
index 8306a839da46..2b93af231a22 100644
--- a/include/rtl/ref.hxx
+++ b/include/rtl/ref.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_REF_HXX_
-#define _RTL_REF_HXX_
+#ifndef INCLUDED_RTL_REF_HXX
+#define INCLUDED_RTL_REF_HXX
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
@@ -238,6 +238,6 @@ inline T * get_pointer( Reference<T> const& r )
 
 } // namespace rtl
 
-#endif /* !_RTL_REF_HXX_ */
+#endif /* ! INCLUDED_RTL_REF_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/strbuf.h b/include/rtl/strbuf.h
index 05dd2de8c61c..aede740fa5f8 100644
--- a/include/rtl/strbuf.h
+++ b/include/rtl/strbuf.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_STRBUF_H_
-#define _RTL_STRBUF_H_
+#ifndef INCLUDED_RTL_STRBUF_H
+#define INCLUDED_RTL_STRBUF_H
 
 #include "sal/config.h"
 
@@ -132,6 +132,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_stringbuffer_remove(
 }
 #endif
 
-#endif  /* _RTL_STRBUF_H_ */
+#endif // INCLUDED_RTL_STRBUF_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index d04f828d3232..0b4afaced715 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_STRBUF_HXX_
-#define _RTL_STRBUF_HXX_
+#ifndef INCLUDED_RTL_STRBUF_HXX
+#define INCLUDED_RTL_STRBUF_HXX
 
 #include "sal/config.h"
 
@@ -918,7 +918,7 @@ using ::rtl::OStringBuffer;
 #endif
 
 #endif  /* __cplusplus */
-#endif  /* _RTL_STRBUF_HXX_ */
+#endif // INCLUDED_RTL_STRBUF_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/string.h b/include/rtl/string.h
index 28b089b7e16b..d4c5420bda3c 100644
--- a/include/rtl/string.h
+++ b/include/rtl/string.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_STRING_H_
-#define _RTL_STRING_H_
+#ifndef INCLUDED_RTL_STRING_H
+#define INCLUDED_RTL_STRING_H
 
 #include "sal/config.h"
 
@@ -1424,6 +1424,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_string_ensureCapacity( rtl_String ** str, sal_In
 }
 #endif
 
-#endif /* _RTL_STRING_H_ */
+#endif // INCLUDED_RTL_STRING_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index e9c6350c006d..3a338fd8d05e 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_STRING_HXX_
-#define _RTL_STRING_HXX_
+#ifndef INCLUDED_RTL_STRING_HXX
+#define INCLUDED_RTL_STRING_HXX
 
 #include "sal/config.h"
 
@@ -1750,6 +1750,6 @@ using ::rtl::OStringHash;
 using ::rtl::OStringLiteral;
 #endif
 
-#endif /* _RTL_STRING_HXX_ */
+#endif // INCLUDED_RTL_STRING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx
index a6e3467209e3..8ab2ffcaf5e3 100644
--- a/include/rtl/stringconcat.hxx
+++ b/include/rtl/stringconcat.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef RTL_STRINGCONCAT_HXX
-#define RTL_STRINGCONCAT_HXX
+#ifndef INCLUDED_RTL_STRINGCONCAT_HXX
+#define INCLUDED_RTL_STRINGCONCAT_HXX
 
 #include <rtl/stringutils.hxx>
 
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index fc47a248cde7..547df5f1f84e 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _RTL_STRINGUTILS_HXX_
-#define _RTL_STRINGUTILS_HXX_
+#ifndef INCLUDED_RTL_STRINGUTILS_HXX
+#define INCLUDED_RTL_STRINGUTILS_HXX
 
 #include "sal/config.h"
 
@@ -182,6 +182,6 @@ struct Enable< T, true >
 
 } /* Namespace */
 
-#endif /* _RTL_STRINGUTILS_HXX_ */
+#endif // INCLUDED_RTL_STRINGUTILS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/tencinfo.h b/include/rtl/tencinfo.h
index 34ba34f17374..0b1415da7ac4 100644
--- a/include/rtl/tencinfo.h
+++ b/include/rtl/tencinfo.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_TENCINFO_H
-#define _RTL_TENCINFO_H
+#ifndef INCLUDED_RTL_TENCINFO_H
+#define INCLUDED_RTL_TENCINFO_H
 
 #include "sal/config.h"
 
@@ -273,6 +273,6 @@ rtl_getWindowsCodePageFromTextEncoding(rtl_TextEncoding nEncoding);
 }
 #endif
 
-#endif /* _RTL_TENCINFO_H */
+#endif // INCLUDED_RTL_TENCINFO_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/textcvt.h b/include/rtl/textcvt.h
index a67b2416ee7a..645c942c56dd 100644
--- a/include/rtl/textcvt.h
+++ b/include/rtl/textcvt.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_TEXTCVT_H
-#define _RTL_TEXTCVT_H
+#ifndef INCLUDED_RTL_TEXTCVT_H
+#define INCLUDED_RTL_TEXTCVT_H
 
 #include "sal/config.h"
 
@@ -172,6 +172,6 @@ SAL_DLLPUBLIC sal_Size SAL_CALL rtl_convertUnicodeToText(
 }
 #endif
 
-#endif /* _RTL_TEXTCVT_H */
+#endif // INCLUDED_RTL_TEXTCVT_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/textenc.h b/include/rtl/textenc.h
index 676f8c23186a..ba17f6841979 100644
--- a/include/rtl/textenc.h
+++ b/include/rtl/textenc.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_TEXTENC_H
-#define _RTL_TEXTENC_H
+#ifndef INCLUDED_RTL_TEXTENC_H
+#define INCLUDED_RTL_TEXTENC_H
 
 #ifdef _SOLAR_RSC_INVOKED
 /* Enable resources to use these values, rsc can't handle casts */
@@ -265,6 +265,6 @@ Japanese (JIS 0212)                             RTL_TEXTENCODING_JISX_0212
 # Currently not implemented
 */
 
-#endif /* _RTL_TEXTENC_H */
+#endif // INCLUDED_RTL_TEXTENC_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/unload.h b/include/rtl/unload.h
index 118b5cce9127..f38cd865a0f6 100644
--- a/include/rtl/unload.h
+++ b/include/rtl/unload.h
@@ -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 _RTL_UNLOAD_H_
-#define _RTL_UNLOAD_H_
+#ifndef INCLUDED_RTL_UNLOAD_H
+#define INCLUDED_RTL_UNLOAD_H
 
 #include "sal/config.h"
 
diff --git a/include/rtl/uri.h b/include/rtl/uri.h
index 251af025ef82..a1ec51553623 100644
--- a/include/rtl/uri.h
+++ b/include/rtl/uri.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_URI_H_
-#define _RTL_URI_H_
+#ifndef INCLUDED_RTL_URI_H
+#define INCLUDED_RTL_URI_H
 
 #include "sal/config.h"
 
@@ -347,6 +347,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL rtl_uriConvertRelToAbs(
 }
 #endif /* __cplusplus */
 
-#endif /* _RTL_URI_H_ */
+#endif // INCLUDED_RTL_URI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/uri.hxx b/include/rtl/uri.hxx
index 6e9ca00281c3..3f62ac4f6d15 100644
--- a/include/rtl/uri.hxx
+++ b/include/rtl/uri.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_URI_HXX_
-#define _RTL_URI_HXX_
+#ifndef INCLUDED_RTL_URI_HXX
+#define INCLUDED_RTL_URI_HXX
 
 #include "rtl/malformeduriexception.hxx"
 #include "rtl/uri.h"
@@ -139,6 +139,6 @@ inline rtl::OUString Uri::convertRelToAbs(rtl::OUString const & rBaseUriRef,
 
 }
 
-#endif // _RTL_URI_HXX_
+#endif // INCLUDED_RTL_URI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/ustrbuf.h b/include/rtl/ustrbuf.h
index 7df10c18cc40..2a1e3a9c94e0 100644
--- a/include/rtl/ustrbuf.h
+++ b/include/rtl/ustrbuf.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_USTRBUF_H_
-#define _RTL_USTRBUF_H_
+#ifndef INCLUDED_RTL_USTRBUF_H
+#define INCLUDED_RTL_USTRBUF_H
 
 #include "sal/config.h"
 
@@ -207,6 +207,6 @@ SAL_DLLPUBLIC rtl_uString * SAL_CALL rtl_uStringBuffer_refReturn( rtl_uString *p
 }
 #endif
 
-#endif  /* _RTL_USTRBUF_H_ */
+#endif // INCLUDED_RTL_USTRBUF_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index ec40448b60d4..f7d640c0e415 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_USTRBUF_HXX_
-#define _RTL_USTRBUF_HXX_
+#ifndef INCLUDED_RTL_USTRBUF_HXX
+#define INCLUDED_RTL_USTRBUF_HXX
 
 #include "sal/config.h"
 
@@ -1381,6 +1381,6 @@ typedef rtlunittest::OUStringBuffer OUStringBuffer;
 using ::rtl::OUStringBuffer;
 #endif
 
-#endif  /* _RTL_USTRBUF_HXX_ */
+#endif // INCLUDED_RTL_USTRBUF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/ustring.h b/include/rtl/ustring.h
index 8d206512904b..dfcf7209dada 100644
--- a/include/rtl/ustring.h
+++ b/include/rtl/ustring.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_USTRING_H_
-#define _RTL_USTRING_H_
+#ifndef INCLUDED_RTL_USTRING_H
+#define INCLUDED_RTL_USTRING_H
 
 #include "sal/config.h"
 
@@ -2038,6 +2038,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uString_ensureCapacity( rtl_uString ** str, sal_
 }
 #endif
 
-#endif /* _RTL_USTRING_H_ */
+#endif // INCLUDED_RTL_USTRING_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 45a7441f9591..327f455f1648 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_USTRING_HXX_
-#define _RTL_USTRING_HXX_
+#ifndef INCLUDED_RTL_USTRING_HXX
+#define INCLUDED_RTL_USTRING_HXX
 
 #include "sal/config.h"
 
diff --git a/include/rtl/uuid.h b/include/rtl/uuid.h
index 31d50968110a..e657950beb72 100644
--- a/include/rtl/uuid.h
+++ b/include/rtl/uuid.h
@@ -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 _RTL_UUID_H_
-#define _RTL_UUID_H_
+#ifndef INCLUDED_RTL_UUID_H
+#define INCLUDED_RTL_UUID_H
 
 #include "sal/config.h"